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
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
neoppod
Commits
233f6eb3
Commit
233f6eb3
authored
May 12, 2017
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
745941f7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
neo/client/Storage.py
neo/client/Storage.py
+1
-1
neo/master/app.py
neo/master/app.py
+2
-1
neo/master/handlers/client.py
neo/master/handlers/client.py
+4
-1
neo/neoctl/app.py
neo/neoctl/app.py
+1
-0
No files found.
neo/client/Storage.py
View file @
233f6eb3
...
@@ -136,7 +136,7 @@ class Storage(BaseStorage.BaseStorage,
...
@@ -136,7 +136,7 @@ class Storage(BaseStorage.BaseStorage,
def
supportsUndo
(
self
):
def
supportsUndo
(
self
):
return
True
return
True
def
supportsTransactionalUndo
(
self
):
def
supportsTransactionalUndo
(
self
):
# TODO remove (ZODB.f595f7e7)
return
True
return
True
def
loadEx
(
self
,
oid
,
version
):
def
loadEx
(
self
,
oid
,
version
):
...
...
neo/master/app.py
View file @
233f6eb3
...
@@ -516,12 +516,13 @@ class Application(BaseApplication):
...
@@ -516,12 +516,13 @@ class Application(BaseApplication):
tid
=
txn
.
getTID
()
tid
=
txn
.
getTID
()
transaction_node
=
txn
.
getNode
()
transaction_node
=
txn
.
getNode
()
invalidate_objects
=
Packets
.
InvalidateObjects
(
tid
,
txn
.
getOIDList
())
invalidate_objects
=
Packets
.
InvalidateObjects
(
tid
,
txn
.
getOIDList
())
# NOTE send invalidation to clients
for
client_node
in
self
.
nm
.
getClientList
(
only_identified
=
True
):
for
client_node
in
self
.
nm
.
getClientList
(
only_identified
=
True
):
if
client_node
is
transaction_node
:
if
client_node
is
transaction_node
:
client_node
.
send
(
Packets
.
AnswerTransactionFinished
(
ttid
,
tid
),
client_node
.
send
(
Packets
.
AnswerTransactionFinished
(
ttid
,
tid
),
msg_id
=
txn
.
getMessageId
())
# NOTE msgid: out-of-order answer
msg_id
=
txn
.
getMessageId
())
# NOTE msgid: out-of-order answer
else
:
else
:
# NOTE notifies clients
sequentially &
irregardless of whether client was subscribed
# NOTE notifies clients irregardless of whether client was subscribed
client_node
.
send
(
invalidate_objects
)
client_node
.
send
(
invalidate_objects
)
# Unlock Information to relevant storage nodes.
# Unlock Information to relevant storage nodes.
...
...
neo/master/handlers/client.py
View file @
233f6eb3
...
@@ -69,7 +69,10 @@ class ClientServiceHandler(MasterHandler):
...
@@ -69,7 +69,10 @@ class ClientServiceHandler(MasterHandler):
if
tid
:
if
tid
:
p
=
Packets
.
AskLockInformation
(
ttid
,
tid
)
p
=
Packets
.
AskLockInformation
(
ttid
,
tid
)
for
node
in
node_list
:
for
node
in
node_list
:
node
.
ask
(
p
,
timeout
=
60
)
node
.
ask
(
p
,
timeout
=
60
)
# NOTE
# NOTE continues in onTransactionCommitted
else
:
else
:
conn
.
answer
(
Errors
.
IncompleteTransaction
())
conn
.
answer
(
Errors
.
IncompleteTransaction
())
# It's simpler to abort automatically rather than asking the client
# It's simpler to abort automatically rather than asking the client
...
...
neo/neoctl/app.py
View file @
233f6eb3
...
@@ -40,6 +40,7 @@ action_dict = {
...
@@ -40,6 +40,7 @@ action_dict = {
'truncate'
:
'truncate'
,
'truncate'
:
'truncate'
,
}
}
# ex 'S2' -> u32
uuid_int
=
(
lambda
ns
:
lambda
uuid
:
uuid_int
=
(
lambda
ns
:
lambda
uuid
:
(
ns
[
uuid
[
0
]]
<<
24
)
+
int
(
uuid
[
1
:])
(
ns
[
uuid
[
0
]]
<<
24
)
+
int
(
uuid
[
1
:])
)({
str
(
k
)[
0
]:
v
for
k
,
v
in
UUID_NAMESPACES
.
iteritems
()})
)({
str
(
k
)[
0
]:
v
for
k
,
v
in
UUID_NAMESPACES
.
iteritems
()})
...
...
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