Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neoppod
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
Ivan Tyagov
neoppod
Commits
1f6bbcc1
Commit
1f6bbcc1
authored
Mar 21, 2012
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rewrite (inside protocol, to make it standalone) a simpler Enum type
parent
fee708c3
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
92 additions
and
109 deletions
+92
-109
neo/lib/protocol.py
neo/lib/protocol.py
+88
-58
neo/lib/util.py
neo/lib/util.py
+0
-47
neo/neoctl/app.py
neo/neoctl/app.py
+3
-3
neo/tests/testProtocol.py
neo/tests/testProtocol.py
+1
-1
No files found.
neo/lib/protocol.py
View file @
1f6bbcc1
...
@@ -20,11 +20,13 @@ import traceback
...
@@ -20,11 +20,13 @@ import traceback
from
socket
import
inet_ntoa
,
inet_aton
from
socket
import
inet_ntoa
,
inet_aton
from
cStringIO
import
StringIO
from
cStringIO
import
StringIO
from
struct
import
Struct
from
struct
import
Struct
try
:
from
.util
import
Enum
,
getAddressType
from
.util
import
getAddressType
except
ImportError
:
pass
# The protocol version (major, minor).
# The protocol version (major, minor).
PROTOCOL_VERSION
=
(
8
,
1
)
PROTOCOL_VERSION
=
(
9
,
1
)
# Size restrictions.
# Size restrictions.
MIN_PACKET_SIZE
=
10
MIN_PACKET_SIZE
=
10
...
@@ -38,70 +40,98 @@ assert PACKET_HEADER_FORMAT.size == 10, \
...
@@ -38,70 +40,98 @@ assert PACKET_HEADER_FORMAT.size == 10, \
(
PACKET_HEADER_FORMAT
.
size
,
)
(
PACKET_HEADER_FORMAT
.
size
,
)
RESPONSE_MASK
=
0x8000
RESPONSE_MASK
=
0x8000
class
ErrorCodes
(
Enum
):
class
Enum
(
tuple
):
ACK
=
Enum
.
Item
(
0
)
NOT_READY
=
Enum
.
Item
(
1
)
class
Item
(
int
):
OID_NOT_FOUND
=
Enum
.
Item
(
2
)
__slots__
=
'_name'
,
'_enum'
OID_DOES_NOT_EXIST
=
Enum
.
Item
(
6
)
def
__str__
(
self
):
TID_NOT_FOUND
=
Enum
.
Item
(
3
)
return
self
.
_name
PROTOCOL_ERROR
=
Enum
.
Item
(
4
)
def
__repr__
(
self
):
BROKEN_NODE
=
Enum
.
Item
(
5
)
return
"<EnumItem %s (%d)>"
%
(
self
.
_name
,
self
)
ALREADY_PENDING
=
Enum
.
Item
(
7
)
def
__eq__
(
self
,
other
):
REPLICATION_ERROR
=
Enum
.
Item
(
8
)
if
type
(
other
)
is
self
.
__class__
:
CHECKING_ERROR
=
Enum
.
Item
(
9
)
assert
other
.
_enum
is
self
.
_enum
ErrorCodes
=
ErrorCodes
()
return
other
is
self
return
other
==
int
(
self
)
class
ClusterStates
(
Enum
):
RECOVERING
=
Enum
.
Item
(
1
)
def
__new__
(
cls
,
func
):
VERIFYING
=
Enum
.
Item
(
2
)
names
=
func
.
func_code
.
co_names
RUNNING
=
Enum
.
Item
(
3
)
self
=
tuple
.
__new__
(
cls
,
map
(
cls
.
Item
,
xrange
(
len
(
names
))))
STOPPING
=
Enum
.
Item
(
4
)
self
.
_name
=
func
.
__name__
STARTING_BACKUP
=
Enum
.
Item
(
5
)
for
item
,
name
in
zip
(
self
,
names
):
BACKINGUP
=
Enum
.
Item
(
6
)
setattr
(
self
,
name
,
item
)
STOPPING_BACKUP
=
Enum
.
Item
(
7
)
item
.
_name
=
name
ClusterStates
=
ClusterStates
()
item
.
_enum
=
self
return
self
class
NodeTypes
(
Enum
):
MASTER
=
Enum
.
Item
(
1
)
def
__repr__
(
self
):
STORAGE
=
Enum
.
Item
(
2
)
return
"<Enum %s>"
%
self
.
_name
CLIENT
=
Enum
.
Item
(
3
)
ADMIN
=
Enum
.
Item
(
4
)
NodeTypes
=
NodeTypes
()
@
Enum
def
ErrorCodes
():
class
NodeStates
(
Enum
):
ACK
RUNNING
=
Enum
.
Item
(
1
)
NOT_READY
TEMPORARILY_DOWN
=
Enum
.
Item
(
2
)
OID_NOT_FOUND
DOWN
=
Enum
.
Item
(
3
)
TID_NOT_FOUND
BROKEN
=
Enum
.
Item
(
4
)
OID_DOES_NOT_EXIST
HIDDEN
=
Enum
.
Item
(
5
)
PROTOCOL_ERROR
PENDING
=
Enum
.
Item
(
6
)
BROKEN_NODE
UNKNOWN
=
Enum
.
Item
(
7
)
ALREADY_PENDING
NodeStates
=
NodeStates
()
REPLICATION_ERROR
CHECKING_ERROR
class
CellStates
(
Enum
):
@
Enum
def
ClusterStates
():
RECOVERING
VERIFYING
RUNNING
STOPPING
STARTING_BACKUP
BACKINGUP
STOPPING_BACKUP
@
Enum
def
NodeTypes
():
MASTER
STORAGE
CLIENT
ADMIN
@
Enum
def
NodeStates
():
RUNNING
TEMPORARILY_DOWN
DOWN
BROKEN
HIDDEN
PENDING
UNKNOWN
@
Enum
def
CellStates
():
# Normal state: cell is writable/readable, and it isn't planned to drop it.
# Normal state: cell is writable/readable, and it isn't planned to drop it.
UP_TO_DATE
=
Enum
.
Item
(
1
)
UP_TO_DATE
# Write-only cell. Last transactions are missing because storage is/was down
# Write-only cell. Last transactions are missing because storage is/was down
# for a while, or because it is new for the partition. It usually becomes
# for a while, or because it is new for the partition. It usually becomes
# UP_TO_DATE when replication is done.
# UP_TO_DATE when replication is done.
OUT_OF_DATE
=
Enum
.
Item
(
2
)
OUT_OF_DATE
# Same as UP_TO_DATE, except that it will be discarded as soon as another
# Same as UP_TO_DATE, except that it will be discarded as soon as another
# node finishes to replicate it. It means a partition is moved from 1 node
# node finishes to replicate it. It means a partition is moved from 1 node
# to another.
# to another.
FEEDING
=
Enum
.
Item
(
3
)
FEEDING
# Not really a state: only used in network packets to tell storages to drop
# Not really a state: only used in network packets to tell storages to drop
# partitions.
# partitions.
DISCARDED
=
Enum
.
Item
(
4
)
DISCARDED
# A check revealed that data differs from other replicas. Cell is neither
# A check revealed that data differs from other replicas. Cell is neither
# readable nor writable.
# readable nor writable.
CORRUPTED
=
Enum
.
Item
(
5
)
CORRUPTED
CellStates
=
CellStates
()
class
LockState
(
Enum
):
@
Enum
NOT_LOCKED
=
Enum
.
Item
(
1
)
def
LockState
():
GRANTED
=
Enum
.
Item
(
2
)
NOT_LOCKED
GRANTED
_TO_OTHER
=
Enum
.
Item
(
3
)
GRANTED
LockState
=
LockState
()
GRANTED_TO_OTHER
# used for logging
# used for logging
node_state_prefix_dict
=
{
node_state_prefix_dict
=
{
...
@@ -1690,10 +1720,10 @@ def Errors():
...
@@ -1690,10 +1720,10 @@ def Errors():
handler_method_name_dict
=
{}
handler_method_name_dict
=
{}
def
register_error
(
code
):
def
register_error
(
code
):
return
lambda
self
,
message
=
''
:
Error
(
code
,
message
)
return
lambda
self
,
message
=
''
:
Error
(
code
,
message
)
for
code
,
error
in
ErrorCodes
.
iteritems
()
:
for
error
in
ErrorCodes
:
name
=
''
.
join
(
part
.
capitalize
()
for
part
in
str
(
error
).
split
(
'_'
))
name
=
''
.
join
(
part
.
capitalize
()
for
part
in
str
(
error
).
split
(
'_'
))
registry_dict
[
name
]
=
register_error
(
error
)
registry_dict
[
name
]
=
register_error
(
int
(
error
)
)
handler_method_name_dict
[
code
]
=
name
[
0
].
lower
()
+
name
[
1
:]
handler_method_name_dict
[
int
(
error
)
]
=
name
[
0
].
lower
()
+
name
[
1
:]
return
type
(
'ErrorRegistry'
,
(
dict
,),
return
type
(
'ErrorRegistry'
,
(
dict
,),
registry_dict
)(
handler_method_name_dict
)
registry_dict
)(
handler_method_name_dict
)
...
...
neo/lib/util.py
View file @
1f6bbcc1
...
@@ -124,53 +124,6 @@ def parseMasterList(masters, except_node=None):
...
@@ -124,53 +124,6 @@ def parseMasterList(masters, except_node=None):
"ipv6 and ipv4 simultaneously"
)
"ipv6 and ipv4 simultaneously"
)
return
master_node_list
,
socket_connector
return
master_node_list
,
socket_connector
class
Enum
(
dict
):
"""
Simulate an enumeration, define them as follow :
class MyEnum(Enum):
ITEM1 = Enum.Item(0)
ITEM2 = Enum.Item(1)
Enum items must be written in full upper case
"""
class
Item
(
int
):
_enum
=
None
_name
=
None
def
__new__
(
cls
,
value
):
instance
=
super
(
Enum
.
Item
,
cls
).
__new__
(
cls
,
value
)
instance
.
_enum
=
None
instance
.
_name
=
None
return
instance
def
__str__
(
self
):
return
self
.
_name
def
__repr__
(
self
):
return
"<EnumItem %s (%d)>"
%
(
self
.
_name
,
self
)
def
__eq__
(
self
,
other
):
if
other
is
None
:
return
False
assert
isinstance
(
other
,
(
Enum
.
Item
,
int
,
float
,
long
))
if
isinstance
(
other
,
Enum
):
assert
self
.
_enum
==
other
.
_enum
return
int
(
self
)
==
int
(
other
)
def
__init__
(
self
):
dict
.
__init__
(
self
)
for
name
in
dir
(
self
):
if
not
re
.
match
(
'^[A-Z_]*$'
,
name
):
continue
item
=
getattr
(
self
,
name
)
item
.
_name
=
name
item
.
_enum
=
self
self
[
int
(
item
)]
=
item
def
getByName
(
self
,
name
):
return
getattr
(
self
,
name
)
class
ReadBuffer
(
object
):
class
ReadBuffer
(
object
):
"""
"""
...
...
neo/neoctl/app.py
View file @
1f6bbcc1
...
@@ -44,13 +44,13 @@ class TerminalNeoCTL(object):
...
@@ -44,13 +44,13 @@ class TerminalNeoCTL(object):
# Utility methods (could be functions)
# Utility methods (could be functions)
def
asNodeState
(
self
,
value
):
def
asNodeState
(
self
,
value
):
return
NodeStates
.
getByName
(
value
.
upper
())
return
getattr
(
NodeStates
,
value
.
upper
())
def
asNodeType
(
self
,
value
):
def
asNodeType
(
self
,
value
):
return
NodeTypes
.
getByName
(
value
.
upper
())
return
getattr
(
NodeTypes
,
value
.
upper
())
def
asClusterState
(
self
,
value
):
def
asClusterState
(
self
,
value
):
return
ClusterStates
.
getByName
(
value
.
upper
())
return
getattr
(
ClusterStates
,
value
.
upper
())
def
asNode
(
self
,
value
):
def
asNode
(
self
,
value
):
return
bin
(
value
)
return
bin
(
value
)
...
...
neo/tests/testProtocol.py
View file @
1f6bbcc1
...
@@ -614,7 +614,7 @@ class ProtocolTests(NeoUnitTestBase):
...
@@ -614,7 +614,7 @@ class ProtocolTests(NeoUnitTestBase):
def
test_AnswerHasLock
(
self
):
def
test_AnswerHasLock
(
self
):
oid
=
self
.
getNextTID
()
oid
=
self
.
getNextTID
()
for
lock_state
in
LockState
.
itervalues
()
:
for
lock_state
in
LockState
:
p
=
Packets
.
AnswerHasLock
(
oid
,
lock_state
)
p
=
Packets
.
AnswerHasLock
(
oid
,
lock_state
)
self
.
assertEqual
(
p
.
decode
(),
(
oid
,
lock_state
))
self
.
assertEqual
(
p
.
decode
(),
(
oid
,
lock_state
))
...
...
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