Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefane Fermigier
neo
Commits
7ee9a615
Commit
7ee9a615
authored
Jun 01, 2017
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
4d71333f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
55 additions
and
19 deletions
+55
-19
go/neo/master.go
go/neo/master.go
+55
-19
No files found.
go/neo/master.go
View file @
7ee9a615
...
...
@@ -21,6 +21,7 @@ package neo
import
(
"context"
"errors"
"flag"
"fmt"
"io"
...
...
@@ -54,7 +55,7 @@ type Master struct {
ctlStop
chan
chan
error
// request to stop cluster
ctlShutdown
chan
chan
error
// request to shutdown cluster XXX with ctx ?
// channels from
various work
ers to main driver
// channels from
workers directly serving pe
ers to main driver
nodeCome
chan
nodeCome
// node connected
nodeLeave
chan
nodeLeave
// node disconnected
}
...
...
@@ -72,6 +73,7 @@ type nodeLeave struct {
link
*
NodeLink
// XXX better use uuid allocated on nodeCome ?
}
// NewMaster TODO ...
func
NewMaster
(
clusterName
string
)
*
Master
{
m
:=
&
Master
{
clusterName
:
clusterName
}
m
.
nodeUUID
=
m
.
allocUUID
(
MASTER
)
...
...
@@ -121,7 +123,7 @@ func (m *Master) setClusterState(state ClusterState) {
}
// run is
a
process which implements main master cluster management logic: node tracking, cluster
// run is
the
process which implements main master cluster management logic: node tracking, cluster
// state updates, scheduling data movement between storage nodes etc
func
(
m
*
Master
)
run
(
ctx
context
.
Context
)
{
...
...
@@ -130,23 +132,30 @@ func (m *Master) run(ctx context.Context) {
for
ctx
.
Err
()
==
nil
{
err
:=
m
.
recovery
(
ctx
)
if
err
!=
nil
{
return
// recovery cancelled XXX recheck
fmt
.
Println
(
err
)
return
// recovery cancelled
}
// successful recovery -> verify
err
=
m
.
verify
(
ctx
)
if
err
!=
nil
{
fmt
.
Println
(
err
)
continue
// -> recovery
}
// successful verify -> service
err
=
m
.
service
(
ctx
)
if
err
!=
nil
{
fmt
.
Println
(
err
)
continue
// -> recovery
}
// XXX could err be == nil here - after service finishes ?
// XXX shutdown ?
}
fmt
.
Printf
(
"master: run: %v
\n
"
,
ctx
.
Err
())
}
...
...
@@ -165,6 +174,7 @@ func (m *Master) run(ctx context.Context) {
// - nil: recovery was ok and a command came for cluster to start
// - !nil: recovery was cancelled
func
(
m
*
Master
)
recovery
(
ctx
context
.
Context
)
(
err
error
)
{
fmt
.
Println
(
"master: recovery"
)
defer
errcontextf
(
&
err
,
"master: recovery"
)
m
.
setClusterState
(
ClusterRecovering
)
...
...
@@ -218,6 +228,9 @@ loop:
m
.
partTab
=
r
.
partTab
}
// XXX handle case of new cluster - when no storage reports valid parttab
// XXX -> create new parttab
// XXX update something indicating cluster currently can be operational or not ?
...
...
@@ -269,6 +282,7 @@ type storRecovery struct {
// it retrieves various ids and partition table from as stored on the storage
func
storCtlRecovery
(
ctx
context
.
Context
,
link
*
NodeLink
,
res
chan
storRecovery
)
{
var
err
error
// XXX where this close link on error should be ?
defer
func
()
{
if
err
==
nil
{
return
...
...
@@ -341,8 +355,13 @@ var errClusterDegraded = errors.New("cluster became non-operatonal")
// verify drives cluster via verification phase
//
// when verify finishes error indicates:
// - nil: verification completed ok; cluster is ready to enter running state
// - !nil: verification failed; cluster needs to be reset to recovery state
//
// prerequisite for start: .partTab is operational wrt .nodeTab
func
(
m
*
Master
)
verify
(
ctx
context
.
Context
)
(
err
error
)
{
fmt
.
Println
(
"master: verify"
)
defer
errcontextf
(
&
err
,
"master: verify"
)
m
.
setClusterState
(
ClusterVerifying
)
...
...
@@ -352,10 +371,12 @@ func (m *Master) verify(ctx context.Context) (err error) {
verify
:=
make
(
chan
storVerify
)
inprogress
:=
0
// verification = ask every storage to verify and wait for all them to complete
// XXX "all them" -> "enough of them"?
// NOTE we don't reset m.lastOid / m.lastTid to 0 in the beginning of verification
//
with the idea that XXX
//
XXX (= py), rationale=?
// XXX ask every storage to verify and wait for _all_ them to complete?
// start verification on all storages we are currently in touch with
for
_
,
stor
:=
range
m
.
nodeTab
.
StorageList
()
{
if
stor
.
NodeState
>
DOWN
{
// XXX state cmp ok ? XXX or stor.Link != nil ?
...
...
@@ -390,13 +411,17 @@ loop:
break
loop
}
// a storage node came through verification - TODO
// a storage node came through verification - adjust our last{Oid,Tid} if ok
// on error check - whether cluster became non-operational and stop verification if so
case
v
:=
<-
verify
:
inprogress
--
if
v
.
err
!=
nil
{
fmt
.
Printf
(
"master: verify: %v
\n
"
,
v
.
err
)
// XXX mark S as non-working in nodeTab
// mark storage as non-working in nodeTab
// FIXME better -> v.node.setState(DOWN) ?
m
.
nodeTab
.
UpdateLinkDown
(
v
.
link
)
// check partTab is still operational
// if not -> cancel to go back to recovery
...
...
@@ -441,18 +466,19 @@ loop:
type
storVerify
struct
{
lastOid
zodb
.
Oid
lastTid
zodb
.
Tid
link
*
NodeLink
err
error
}
// storCtlVerify drives a storage node during cluster verifying (= starting) state
func
storCtlVerify
(
ctx
context
.
Context
,
link
*
NodeLink
,
res
chan
storVerify
)
{
// XXX
err context +
link.Close on err
// XXX link.Close on err
// XXX cancel on ctx
var
err
error
defer
func
()
{
if
err
!=
nil
{
res
<-
storVerify
{
err
:
err
}
res
<-
storVerify
{
link
:
link
,
err
:
err
}
}
}()
defer
errcontextf
(
&
err
,
"%s: verify"
,
link
)
...
...
@@ -479,7 +505,7 @@ func storCtlVerify(ctx context.Context, link *NodeLink, res chan storVerify) {
}
// send results to driver
res
<-
storVerify
{
lastOid
:
last
.
LastOid
,
lastTid
:
last
.
LastTid
}
res
<-
storVerify
{
l
ink
:
link
,
l
astOid
:
last
.
LastOid
,
lastTid
:
last
.
LastTid
}
}
...
...
@@ -494,20 +520,34 @@ func storCtlVerify(ctx context.Context, link *NodeLink, res chan storVerify) {
// service drives cluster during running state
//
// prerequisite for start: .partTab is operational wrt .nodeTab and verification passed (XXX)
// TODO document error meanings on return
//
// prerequisite for start: .partTab is operational wrt .nodeTab and verification passed
func
(
m
*
Master
)
service
(
ctx
context
.
Context
)
(
err
error
)
{
fmt
.
Println
(
"master: service"
)
defer
errcontextf
(
&
err
,
"master: service"
)
m
.
setClusterState
(
ClusterRunning
)
loop
:
for
{
select
{
case
n
:=
<-
m
.
nodeCome
:
// TODO
_
=
n
_
,
ok
:=
m
.
accept
(
n
,
/* XXX accept everyone */
)
if
!
ok
{
break
}
// XXX what here ?
case
n
:=
<-
m
.
nodeLeave
:
// TODO
_
=
n
m
.
nodeTab
.
UpdateLinkDown
(
n
.
link
)
// if cluster became non-operational - cancel service
if
!
m
.
partTab
.
OperationalWith
(
&
m
.
nodeTab
)
{
err
=
errClusterDegraded
break
loop
}
// XXX what else ? (-> txn control at least)
...
...
@@ -526,10 +566,6 @@ loop:
}
}
if
err
!=
nil
{
// TODO
}
return
err
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment