Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
ceph
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
certo
ceph
Commits
dcf4f32b
Commit
dcf4f32b
authored
Nov 24, 2020
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed thread timeout in python threading
parent
2daf456c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
0 deletions
+16
-0
Makefile
Makefile
+1
-0
ceph-15.2.4-fix_ceph_thread_timeout.patch
ceph-15.2.4-fix_ceph_thread_timeout.patch
+15
-0
No files found.
Makefile
View file @
dcf4f32b
...
...
@@ -37,6 +37,7 @@ all: ceph-config
patch
-Np1
-d
ceph-15.2.4
<
ceph-15.2.4-no_git.patch
patch
-Np1
-d
ceph-15.2.4
<
ceph-15.2.4-fix_librbd_duplicate.patch
patch
-Np1
-d
ceph-15.2.4
<
ceph-15.2.4-fix_ErasureCodeShec.patch
patch
-Np1
-d
ceph-15.2.4
<
ceph-15.2.4-fix_ceph_thread_timeout.patch
if
[
`uname
-m`
=
'armv7l'
]
;
then
\
patch
-Np1
-d
ceph-15.2.4
<
ceph-15.2.4-arm32_fix.patch
;
\
fi
...
...
ceph-15.2.4-fix_ceph_thread_timeout.patch
0 → 100644
View file @
dcf4f32b
diff -uNr ceph-15.2.4/src/pybind/ceph_argparse.py ceph-15.2.4-fix_ceph_thread_timeout/src/pybind/ceph_argparse.py
--- ceph-15.2.4/src/pybind/ceph_argparse.py 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_ceph_thread_timeout/src/pybind/ceph_argparse.py 2020-11-18 18:57:39.711443174 +1030
@@ -1317,9 +1317,8 @@
if timeout == 0 or timeout == None:
# python threading module will just get blocked if timeout is `None`,
# otherwise it will keep polling until timeout or thread stops.
- # wait for INT32_MAX, as python 3.6.8 use int32_t to present the
- # timeout in integer when converting it to nanoseconds
- timeout = (1 << (32 - 1)) - 1
+ # wait for 5 seconds, as python 3.6.8 use float to present the timeout
+ timeout = 5.0
t = RadosThread(func, *args, **kwargs)
# allow the main thread to exit (presumably, avoid a join() on this
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