octopus: admin/doc-requirements.txt: pin Sphinx at 3.5.4 #43758
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tchaikov
force-pushed
the
octopus-pr-43748
branch
from
146f150
to
0528fc6
Compare
|
tchaikov
force-pushed
the
octopus-pr-43748
branch
from
0528fc6
to
f61fb49
Compare
otherwise we could have following errors:
Invalid C declaration: Expected identifier in nested name, got keyword: int [error at 18]
CEPH_RADOS_API int rados_aio_append (rados_ioctx_t io, const char *oid, rados_completion_t completion, const char *buf, size_t len)
------------------^
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit cf357e1)
In python3.8 comparing strings using 'is' and 'is not' throws syntax warning. Instead use equality operator. Signed-off-by: Varsha Rao <varao@redhat.com> (cherry picked from commit 61e7bcd)
to be compatible with Sphinx 3.2 see https://github.com/michaeljones/breathe/tree/v4.20.0#change-log Signed-off-by: Kefu Chai <kchai@redhat.com> (cherry picked from commit 2f1f16e)
* pin Sphinx at 3.5.4 * pin docutils at 0.18 at least the combination of these two versions is known to compile. to address the bug reported at https://sourceforge.net/p/docutils/bugs/431/ the backtrace looks like: /home/jenkins-build/build/workspace/ceph-pr-docs/build-doc/virtualenv/lib/python3.8/site-packages/sphinx/util/docutils.py:285: RemovedInSphinx30Warning: function based directive support is now deprecated. Use class based directive instead. warnings.warn('function based directive support is now deprecated. ' Exception occurred: File "/home/jenkins-build/build/workspace/ceph-pr-docs/build-doc/virtualenv/lib/python3.8/site-packages/docutils/writers/html5_polyglot/__init__.py", line 445, in section_title_tags if (ids and self.settings.section_self_link AttributeError: 'Values' object has no attribute 'section_self_link' please note this change is not cherry-picked from master, because master already bumped Sphinx to 3.5.4 in 4968baa. Signed-off-by: Kefu Chai <tchaikov@gmail.com> (cherry picked from commit 6362b55) Conflicts: admin/doc-requirements.txt: trivial resolution
tchaikov
force-pushed
the
octopus-pr-43748
branch
from
f61fb49
to
fd83936
Compare
Fixes: https://tracker.ceph.com/issues/53024 Signed-off-by: Nizamudeen A <nia@redhat.com> (cherry picked from commit 946dab4) Conflicts: src/pybind/mgr/dashboard/requirements-lint.txt: trivial resolution
tchaikov
requested review from
aaSharma14 and
nizamial09
and removed request for
a team
should be fixed by the backport of 946dab4. |
|
retest this please. |
|
jenkins retest this please |
doxygen complains at seeing rados_object_list_item gets defined twice. so let's fix it. Signed-off-by: Kefu Chai <kchai@redhat.com> (cherry picked from commit 4c53a02)
…uler
the AsyncScheduler uses an asio timer to dispatch work to its executor
with an optional delay. when no delay is requested, it waits on the
timer with an expiration time in the past (crimson::dmclock::TimeZero)
tests are failing here because poll() is returning without executing the
handlers of those expired timers
asio implements these timers with timerfd and epoll. debugging with
strace, i see that these timers armed with timerfd_settime() are not
always immediately ready according to epoll_wait():
eventfd2(0, EFD_CLOEXEC|EFD_NONBLOCK) = 3
epoll_create1(EPOLL_CLOEXEC) = 4
timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC) = 5
epoll_ctl(4, EPOLL_CTL_ADD, 3, {events=EPOLLIN|EPOLLERR|EPOLLET, data={u32=14164052, u64=14164052}}) = 0
epoll_ctl(4, EPOLL_CTL_ADD, 5, {events=EPOLLIN|EPOLLERR, data={u32=14164064, u64=14164064}}) = 0
timerfd_settime(5, TFD_TIMER_ABSTIME, {it_interval={tv_sec=0, tv_nsec=0}, it_value={tv_sec=0, tv_nsec=1}}, {it_interval={tv_sec=0, tv_nsec=0}, it_value={tv_sec=0, tv_nsec=0}}) = 0
epoll_wait(4, [{events=EPOLLIN, data={u32=14164052, u64=14164052}}], 128, 0) = 1
epoll_wait(4, [], 128, 0) = 0
epoll_wait(4, [], 128, 0) = 0
epoll_wait(4, [], 128, 0) = 0
epoll_wait(4, [], 128, 0) = 0
epoll_wait(4, [{events=EPOLLIN, data={u32=14164064, u64=14164064}}], 128, 0) = 1
in this example, it took 6 calls to context.poll() before it was ready
to execute the timer's handler
to work around this, replace calls to context.poll() with calls to
context.run_for() with a very short duration
Fixes: https://tracker.ceph.com/issues/42788
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 21baed9)
Signed-off-by: Casey Bodley <cbodley@redhat.com> (cherry picked from commit a8e3589) Conflicts: src/test/rgw/CMakeLists.txt src/test/rgw/test_rgw_dmclock_scheduler.cc: trivial resolution
sebastian-philipp
approved these changes
Nov 2, 2021
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
at least the combination of these two versions
is known to compile.
to address the bug reported at
https://sourceforge.net/p/docutils/bugs/431/
the backtrace looks like:
/home/jenkins-build/build/workspace/ceph-pr-docs/build-doc/virtualenv/lib/python3.8/site-packages/sphinx/util/docutils.py:285:
RemovedInSphinx30Warning: function based directive support is now
deprecated. Use class based directive instead.
warnings.warn('function based directive support is now deprecated. '
Exception occurred:
File
"/home/jenkins-build/build/workspace/ceph-pr-docs/build-doc/virtualenv/lib/python3.8/site-packages/docutils/writers/html5_polyglot/init.py",
line 445, in section_title_tags
if (ids and self.settings.section_self_link
AttributeError: 'Values' object has no attribute 'section_self_link'
please note this change is not cherry-picked from
master, because master already bumped Sphinx to 3.5.4
in 4968baa.
Signed-off-by: Kefu Chai tchaikov@gmail.com
(cherry picked from commit 6362b55)
Conflicts:
admin/doc-requirements.txt: trivial resolution
Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test dashboard cephadmjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume tox