Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wmsofts
Paddle
提交
42313a3c
P
Paddle
项目概览
wmsofts
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
42313a3c
编写于
6月 23, 2017
作者:
H
Helin Wang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rename EtcdStore to Etcd
上级
bf79c9e5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
9 deletion
+14
-9
go/cmd/master/master.go
go/cmd/master/master.go
+1
-1
go/master/etcd_store.go
go/master/etcd_store.go
+13
-8
未找到文件。
go/cmd/master/master.go
浏览文件 @
42313a3c
...
@@ -32,7 +32,7 @@ func main() {
...
@@ -32,7 +32,7 @@ func main() {
if
*
endpoints
!=
""
{
if
*
endpoints
!=
""
{
eps
:=
strings
.
Split
(
*
endpoints
,
","
)
eps
:=
strings
.
Split
(
*
endpoints
,
","
)
var
err
error
var
err
error
store
,
err
=
master
.
NewEtcd
Store
(
eps
,
master
.
DefaultLockPath
,
master
.
DefaultStatePath
,
*
ttlSec
)
store
,
err
=
master
.
NewEtcd
(
eps
,
master
.
DefaultLockPath
,
master
.
DefaultStatePath
,
*
ttlSec
)
if
err
!=
nil
{
if
err
!=
nil
{
log
.
Fatal
(
err
)
log
.
Fatal
(
err
)
}
}
...
...
go/master/etcd_store.go
浏览文件 @
42313a3c
...
@@ -16,8 +16,9 @@ const (
...
@@ -16,8 +16,9 @@ const (
DefaultStatePath
=
"/master/state"
DefaultStatePath
=
"/master/state"
)
)
// EtcdStore is the Store implementation backed by etcd.
// Etcd is the etcd abstraction that master uses for fault tolerance
type
EtcdStore
struct
{
// and service registry.
type
Etcd
struct
{
lockPath
string
lockPath
string
statePath
string
statePath
string
ttlSec
int
ttlSec
int
...
@@ -27,8 +28,8 @@ type EtcdStore struct {
...
@@ -27,8 +28,8 @@ type EtcdStore struct {
lock
*
concurrency
.
Mutex
lock
*
concurrency
.
Mutex
}
}
// NewEtcd
Store creates a new EtcdStore
.
// NewEtcd
creates a new Etcd
.
func
NewEtcd
Store
(
endpoints
[]
string
,
lockPath
,
statePath
string
,
ttlSec
int
)
(
*
EtcdStore
,
error
)
{
func
NewEtcd
(
endpoints
[]
string
,
lockPath
,
statePath
string
,
ttlSec
int
)
(
*
Etcd
,
error
)
{
// TODO(helin): gracefully shutdown etcd store. Becuase etcd
// TODO(helin): gracefully shutdown etcd store. Becuase etcd
// store holds a etcd lock, even though the lock will expire
// store holds a etcd lock, even though the lock will expire
// when the lease timeout, we need to implement graceful
// when the lease timeout, we need to implement graceful
...
@@ -59,7 +60,7 @@ func NewEtcdStore(endpoints []string, lockPath, statePath string, ttlSec int) (*
...
@@ -59,7 +60,7 @@ func NewEtcdStore(endpoints []string, lockPath, statePath string, ttlSec int) (*
}
}
log
.
Infof
(
"Successfully acquired lock at %s."
,
lockPath
)
log
.
Infof
(
"Successfully acquired lock at %s."
,
lockPath
)
e
:=
&
Etcd
Store
{}
e
:=
&
Etcd
{}
e
.
client
=
cli
e
.
client
=
cli
e
.
lock
=
lock
e
.
lock
=
lock
e
.
lockPath
=
lockPath
e
.
lockPath
=
lockPath
...
@@ -69,7 +70,7 @@ func NewEtcdStore(endpoints []string, lockPath, statePath string, ttlSec int) (*
...
@@ -69,7 +70,7 @@ func NewEtcdStore(endpoints []string, lockPath, statePath string, ttlSec int) (*
}
}
// Save saves the state into the etcd.
// Save saves the state into the etcd.
func
(
e
*
Etcd
Store
)
Save
(
state
[]
byte
)
error
{
func
(
e
*
Etcd
)
Save
(
state
[]
byte
)
error
{
e
.
mu
.
Lock
()
e
.
mu
.
Lock
()
defer
e
.
mu
.
Unlock
()
defer
e
.
mu
.
Unlock
()
...
@@ -101,7 +102,7 @@ func (e *EtcdStore) Save(state []byte) error {
...
@@ -101,7 +102,7 @@ func (e *EtcdStore) Save(state []byte) error {
}
}
// Load loads the state from etcd.
// Load loads the state from etcd.
func
(
e
*
Etcd
Store
)
Load
()
([]
byte
,
error
)
{
func
(
e
*
Etcd
)
Load
()
([]
byte
,
error
)
{
e
.
mu
.
Lock
()
e
.
mu
.
Lock
()
ctx
:=
context
.
TODO
()
ctx
:=
context
.
TODO
()
get
:=
clientv3
.
OpGet
(
e
.
statePath
)
get
:=
clientv3
.
OpGet
(
e
.
statePath
)
...
@@ -119,8 +120,12 @@ func (e *EtcdStore) Load() ([]byte, error) {
...
@@ -119,8 +120,12 @@ func (e *EtcdStore) Load() ([]byte, error) {
}
}
e
.
lock
=
concurrency
.
NewMutex
(
sess
,
e
.
lockPath
)
e
.
lock
=
concurrency
.
NewMutex
(
sess
,
e
.
lockPath
)
e
.
lock
.
Lock
(
context
.
TODO
())
e
rr
=
e
.
lock
.
Lock
(
context
.
TODO
())
e
.
mu
.
Unlock
()
e
.
mu
.
Unlock
()
if
err
!=
nil
{
return
nil
,
err
}
return
e
.
Load
()
return
e
.
Load
()
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录