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
c6599556
Commit
c6599556
authored
May 12, 2017
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
233f6eb3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
neo/lib/event.py
neo/lib/event.py
+1
-1
neo/lib/util.py
neo/lib/util.py
+1
-1
neo/master/app.py
neo/master/app.py
+2
-2
neo/master/handlers/administration.py
neo/master/handlers/administration.py
+1
-1
No files found.
neo/lib/event.py
View file @
c6599556
...
@@ -109,7 +109,7 @@ class EpollEventManager(object):
...
@@ -109,7 +109,7 @@ class EpollEventManager(object):
self
.
wakeup
()
self
.
wakeup
()
else
:
else
:
self
.
epoll
.
register
(
fd
)
self
.
epoll
.
register
(
fd
)
self
.
addReader
(
conn
)
# FIXME implicitly
adding addReader
self
.
addReader
(
conn
)
# FIXME implicitly
setting "ready to read"
def
unregister
(
self
,
conn
,
close
=
False
):
def
unregister
(
self
,
conn
,
close
=
False
):
new_pending_processing
=
[
x
for
x
in
self
.
_pending_processing
new_pending_processing
=
[
x
for
x
in
self
.
_pending_processing
...
...
neo/lib/util.py
View file @
c6599556
...
@@ -199,7 +199,7 @@ class ReadBuffer(object):
...
@@ -199,7 +199,7 @@ class ReadBuffer(object):
keep
,
let
=
last_chunk
[:
to_read
],
last_chunk
[
to_read
:]
keep
,
let
=
last_chunk
[:
to_read
],
last_chunk
[
to_read
:]
self
.
content
.
appendleft
(
let
)
self
.
content
.
appendleft
(
let
)
chunk_list
[
-
1
]
=
keep
chunk_list
[
-
1
]
=
keep
# join all chunks (one copy)
// XXX only 1 chunk -> no copy at all
# join all chunks (one copy)
data
=
''
.
join
(
chunk_list
)
data
=
''
.
join
(
chunk_list
)
assert
len
(
data
)
==
size
assert
len
(
data
)
==
size
return
data
return
data
...
...
neo/master/app.py
View file @
c6599556
...
@@ -267,7 +267,7 @@ class Application(BaseApplication):
...
@@ -267,7 +267,7 @@ class Application(BaseApplication):
raise
RuntimeError
(
"No upstream cluster to backup"
raise
RuntimeError
(
"No upstream cluster to backup"
" defined in configuration"
)
" defined in configuration"
)
truncate
=
Packets
.
Truncate
(
truncate
=
Packets
.
Truncate
(
self
.
backup_app
.
provideService
())
# NOTE enter to backup main loop
self
.
backup_app
.
provideService
())
except
StoppedOperation
,
e
:
except
StoppedOperation
,
e
:
logging
.
critical
(
'No longer operational'
)
logging
.
critical
(
'No longer operational'
)
truncate
=
Packets
.
Truncate
(
*
e
.
args
)
if
e
.
args
else
None
truncate
=
Packets
.
Truncate
(
*
e
.
args
)
if
e
.
args
else
None
...
@@ -522,7 +522,7 @@ class Application(BaseApplication):
...
@@ -522,7 +522,7 @@ class Application(BaseApplication):
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 irregardless of whether client
was subscribed
# NOTE notifies
all clients irregardless of whether who
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/administration.py
View file @
c6599556
...
@@ -72,7 +72,7 @@ class AdministrationHandler(MasterHandler):
...
@@ -72,7 +72,7 @@ class AdministrationHandler(MasterHandler):
'entering cluster'
%
(
node
,
))
'entering cluster'
%
(
node
,
))
app
.
_startup_allowed
=
True
app
.
_startup_allowed
=
True
state
=
app
.
cluster_state
state
=
app
.
cluster_state
elif
state
==
ClusterStates
.
STARTING_BACKUP
:
# NOTE
elif
state
==
ClusterStates
.
STARTING_BACKUP
:
if
app
.
tm
.
hasPending
()
or
app
.
nm
.
getClientList
(
True
):
if
app
.
tm
.
hasPending
()
or
app
.
nm
.
getClientList
(
True
):
raise
ProtocolError
(
"Can not switch to %s state with pending"
raise
ProtocolError
(
"Can not switch to %s state with pending"
" transactions or connected clients"
%
state
)
" transactions or connected clients"
%
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