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
Labels
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Kirill Smelkov
neo
Commits
fee708c3
Commit
fee708c3
authored
Mar 21, 2012
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify identifyStorageNode parameters.
parent
b041a797
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
8 deletions
+11
-8
neo/master/app.py
neo/master/app.py
+4
-3
neo/master/handlers/identification.py
neo/master/handlers/identification.py
+2
-1
neo/master/recovery.py
neo/master/recovery.py
+1
-1
neo/master/verification.py
neo/master/verification.py
+4
-3
No files found.
neo/master/app.py
View file @
fee708c3
...
@@ -467,11 +467,12 @@ class Application(object):
...
@@ -467,11 +467,12 @@ class Application(object):
# then shutdown
# then shutdown
sys
.
exit
()
sys
.
exit
()
def
identifyStorageNode
(
self
,
uuid
,
node
):
def
identifyStorageNode
(
self
,
known
):
if
self
.
cluster_state
==
ClusterStates
.
STOPPING
:
if
self
.
cluster_state
==
ClusterStates
.
STOPPING
:
raise
NotReadyError
raise
NotReadyError
if
known
:
state
=
NodeStates
.
RUNNING
state
=
NodeStates
.
RUNNING
if
uuid
is
None
or
node
is
Non
e
:
els
e
:
# same as for verification
# same as for verification
state
=
NodeStates
.
PENDING
state
=
NodeStates
.
PENDING
return
state
,
self
.
storage_service_handler
return
state
,
self
.
storage_service_handler
...
...
neo/master/handlers/identification.py
View file @
fee708c3
...
@@ -53,7 +53,8 @@ class IdentificationHandler(MasterHandler):
...
@@ -53,7 +53,8 @@ class IdentificationHandler(MasterHandler):
manager
=
app
.
_current_manager
manager
=
app
.
_current_manager
if
manager
is
None
:
if
manager
is
None
:
manager
=
app
manager
=
app
state
,
handler
=
manager
.
identifyStorageNode
(
uuid
,
node
)
state
,
handler
=
manager
.
identifyStorageNode
(
uuid
is
not
None
and
node
is
not
None
)
human_readable_node_type
=
' storage (%s) '
%
(
state
,
)
human_readable_node_type
=
' storage (%s) '
%
(
state
,
)
elif
node_type
==
NodeTypes
.
MASTER
:
elif
node_type
==
NodeTypes
.
MASTER
:
node_ctor
=
app
.
nm
.
createMaster
node_ctor
=
app
.
nm
.
createMaster
...
...
neo/master/recovery.py
View file @
fee708c3
...
@@ -37,7 +37,7 @@ class RecoveryManager(MasterHandler):
...
@@ -37,7 +37,7 @@ class RecoveryManager(MasterHandler):
def
getHandler
(
self
):
def
getHandler
(
self
):
return
self
return
self
def
identifyStorageNode
(
self
,
uuid
,
node
):
def
identifyStorageNode
(
self
,
_
):
"""
"""
Returns the handler for storage nodes
Returns the handler for storage nodes
"""
"""
...
...
neo/master/verification.py
View file @
fee708c3
...
@@ -77,12 +77,13 @@ class VerificationManager(BaseServiceHandler):
...
@@ -77,12 +77,13 @@ class VerificationManager(BaseServiceHandler):
def
getHandler
(
self
):
def
getHandler
(
self
):
return
self
return
self
def
identifyStorageNode
(
self
,
uuid
,
node
):
def
identifyStorageNode
(
self
,
known
):
"""
"""
Returns the handler to manager the given node
Returns the handler to manager the given node
"""
"""
if
known
:
state
=
NodeStates
.
RUNNING
state
=
NodeStates
.
RUNNING
if
uuid
is
None
or
node
is
Non
e
:
els
e
:
# if node is unknown, it has been forget when the current
# if node is unknown, it has been forget when the current
# partition was validated by the admin
# partition was validated by the admin
# Here the uuid is not cleared to allow lookup pending nodes by
# Here the uuid is not cleared to allow lookup pending nodes by
...
...
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