Patrick Donnelly
1b73c0154c
Merge PR #21883 into master
...
* refs/pull/21883/head:
mds: tighten conditions of calling rejoin_gather_finish()
mds: avoid calling rejoin_gather_finish() two times successively
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-05-11 14:57:42 -07:00
Patrick Donnelly
52707c33fe
Merge PR #21923 into master
...
* refs/pull/21923/head:
mds: set could_consume to false when no purge queue item actually executed
Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-05-11 14:57:36 -07:00
Sage Weil
affb0f87b5
Merge pull request #21942 from tchaikov/wip-qa-ceph-disk-no-mon-config
...
qa/workunits/ceph-disk: --no-mon-config
Reviewed-by: Sage Weil <sage@redhat.com>
2018-05-11 13:01:38 -05:00
Kefu Chai
67f64ebc4b
Merge pull request #21945 from tchaikov/wip-dashboard-errno
...
mgr/dashboard: set errno via the parent class
Reviewed-by: Ricardo Dias <rdias@suse.com>
2018-05-12 01:46:50 +08:00
David Galloway
48d4832f44
Merge pull request #21947 from yuriw/wip-yuriw-crontab
...
qa/tests: added client-upgrade-luminous suit
2018-05-11 13:31:37 -04:00
Yuri Weinstein
450dcecdd9
qa/tests: added client-upgrade-luminous suit
...
Fixes https://tracker.ceph.com/issues/24021
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
2018-05-11 10:27:40 -07:00
Kefu Chai
65925511bc
mgr/dashboard: set errno via the parent class
...
update the test accordingly. see also rados.Error.__str__()
Signed-off-by: Ricardo Dias <rdias@suse.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-05-12 00:55:11 +08:00
Jason Dillaman
0cf2082856
Merge pull request #21524 from dillaman/wip-23517
...
test/librados_test_stub: deterministically load cls shared libraries
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-05-11 11:23:02 -04:00
Kefu Chai
c67d35f282
Merge pull request #21415 from ErwanAliasr1/evelu-cephdisk
...
ceph-disk: get_partition_dev() should fail until get_dev_path(partnam…
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-05-11 22:32:22 +08:00
Kefu Chai
ee33dc8e53
qa/workunits/ceph-disk: --no-mon-config
...
port a095ec8b
to the qa/workunits
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-05-11 21:07:56 +08:00
Jason Dillaman
ce7afd435e
Merge pull request #21292 from zy751713126/snapshot_count
...
rbd: add snapshot count in rbd info
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-05-10 14:55:53 -04:00
zhengyin
a7fa1cbb7e
rbd/info: add snapshot count in rbd info
...
Signed-off-by: Zheng Yin <zhengyin@huayun.com>
2018-05-10 14:55:07 -04:00
Sage Weil
76d512e217
ceph_release: nautilus
...
Signed-off-by: Sage Weil <sage@redhat.com>
2018-05-10 12:19:22 -05:00
Sage Weil
6ae51aed13
Merge remote-tracking branch 'gh/mimic'
2018-05-10 12:18:29 -05:00
Sage Weil
bf578682b0
ceph_release: we are an rc now
...
Signed-off-by: Sage Weil <sage@redhat.com>
2018-05-10 12:16:44 -05:00
Jason Dillaman
4988f24e32
Merge pull request #21930 from dillaman/wip-rbd-backports-mimic
...
rbd: backport of mimic bug fixes
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-05-10 11:27:43 -04:00
Casey Bodley
c22614e07c
Merge pull request #21893 from cbodley/wip-rgw-req-state-time
...
rgw: use coarse_real_clock for req_state::time
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2018-05-10 10:51:47 -04:00
Kefu Chai
23cebfbd3a
Merge pull request #21931 from yuriw/wip-yuriw-fix-mimic-subset
...
tests/qa - fix mimic subset for nightlies
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-05-10 22:45:26 +08:00
Yuri Weinstein
7c7336ab87
tests/qa - fix mimic subset for nightlies
...
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
2018-05-10 07:39:51 -07:00
Casey Bodley
7da0fe2832
Merge pull request #21680 from cbodley/wip-rm-replica-log
...
rgw: remove all traces of cls replica_log
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2018-05-10 10:26:55 -04:00
Jason Dillaman
1e5d96a481
Revert "stop.sh: use --no-mon-config when trying to unmap rbd devices"
...
This reverts commit 6c722cd5f3
.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 3c6b015747
)
2018-05-10 07:44:46 -04:00
Jason Dillaman
a74c93f19c
rbd: don't load config overrides from monitor initially
...
The overrides will be loaded when we connect to the cluster via librados
and the current approach prevents running 'rbd help' without a running
cluster.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 46eafdabde
)
2018-05-10 07:44:44 -04:00
Jason Dillaman
a6aeb7ab43
rbd-mirror: ensure remote demotion is replayed locally
...
The bootstrap process cannot immediately quit if it notices the remote
image is not primary. Instead, it needs to continue if the local image is
still chained to the remote.
Fixes: http://tracker.ceph.com/issues/24009
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit d35bc94319
)
2018-05-10 07:44:38 -04:00
Jason Dillaman
a189ab9c5b
rbd-mirror: fix potential race between image sync and shut down
...
Fixes: http://tracker.ceph.com/issues/24008
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 4f2dbcefc5
)
2018-05-10 07:44:33 -04:00
Jason Dillaman
43bbf99f9f
rbd-mirror: ensure instance replayer is stoped before destructing
...
Fixes: http://tracker.ceph.com/issues/24008
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 9ba94f3030
)
2018-05-10 07:44:29 -04:00
Kefu Chai
ee0321e6b7
Merge pull request #21831 from tchaikov/wip-23966
...
osdc: invoke notify finish context on linger commit failure
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-05-10 18:55:42 +08:00
Kefu Chai
bc157794c1
Merge pull request #21898 from adamemerson/wip-fedora28
...
src: Eliminate new warnings in Fedora 28
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-05-10 18:54:38 +08:00
Kefu Chai
b075af43fc
Merge pull request #21861 from adamemerson/wip-clangtasm
...
osd,mon,pybind: Make able to compile with Clang
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-05-10 18:52:12 +08:00
Mykola Golub
e9bc4687fc
Merge pull request #21912 from dillaman/wip-24064
...
rbd: disk-usage can now optionally compute exact on-disk usage
Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-05-10 13:46:33 +03:00
Mykola Golub
f6ba8726aa
Merge pull request #21910 from dillaman/wip-rbd-help
...
rbd: don't load config overrides from monitor initially
Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-05-10 13:45:35 +03:00
Mykola Golub
c027b47fa6
Merge pull request #21823 from dillaman/wip-24009
...
rbd-mirror: ensure remote demotion is replayed locally
Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-05-10 13:44:55 +03:00
Mykola Golub
03c2a724d1
Merge pull request #21817 from dillaman/wip-24008
...
rbd-mirror: fixed potential crashes during shut down
Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-05-10 13:44:24 +03:00
Kefu Chai
d9aac6a55f
Merge pull request #21853 from rishabh-d-dave/volclient-keyargs-for-all-exceptions
...
rados.pyx: make all exceptions accept keyword arguments
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-05-10 17:30:22 +08:00
Kefu Chai
dd06b36efb
Merge pull request #21886 from jcsp/wip-no-install-hello
...
cmake: do not install `hello` demo module
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-05-10 17:25:33 +08:00
Kefu Chai
3d772f2e4e
Merge pull request #21782 from wido/mgr-telegraf
...
mgr/telegraf: Telegraf module for Ceph Mgr
Reveiwed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-05-10 17:24:46 +08:00
Xuehan Xu
46b4e6afa6
mds: set could_consume to false when no purge queue item actually executed
...
Fixes: http://tracker.ceph.com/issues/24073
Signed-off-by: Xuehan Xu <xuxuehan@360.cn>
2018-05-10 15:14:06 +08:00
Nathan Cutler
c1405fca01
Merge pull request #21918 from smithfarm/wip-24003-mimic
...
script: build-integration-branch: avoid Unicode error
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-05-10 07:15:34 +02:00
Kefu Chai
0e20e83a5c
Merge pull request #21891 from cbodley/wip-cmake-crypto-plugins
...
cmake: move crypto_plugins target
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-05-10 11:01:55 +08:00
Jason Dillaman
3c6b015747
Revert "stop.sh: use --no-mon-config when trying to unmap rbd devices"
...
This reverts commit 6c722cd5f3
.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-05-09 21:28:23 -04:00
Jason Dillaman
7b65fa9dd8
Merge pull request #21770 from zy751713126/remove-redundant-code
...
rbd: add the judgment of resizing the image
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-05-09 18:24:55 -07:00
Casey Bodley
3105ff62e7
Merge pull request #21914 from cbodley/wip-common-async
...
common: add a generic async Completion for use with boost::asio
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2018-05-09 16:32:24 -04:00
Nathan Cutler
ee1f097b34
script: build-integration-branch: avoid Unicode error
...
When run on PRs that have non-ASCII characters in their titles, the script
fails like this when run in a non UTF-8 environment:
UnicodeEncodeError: 'latin-1' codec can't encode character u'\u2026' in
position 651: ordinal not in range(256)
Since failing like that is not useful, avoid the error by forcing ASCII
encoding and filtering out any non-ASCII characters.
Fixes: http://tracker.ceph.com/issues/24003
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 6dd31fdbec
)
2018-05-09 21:20:34 +02:00
Josh Durgin
8582e57316
Merge pull request #21909 from neha-ojha/wip-fix-powercycle
...
qa/suites: set osd_pg_log_dups_tracked in cfuse_workunit_suites_fsync.yaml
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-05-09 11:37:32 -07:00
Adam C. Emerson
83ada1890e
rgw: Silence sign comparison warnings
...
Since we're iterating with a size_t, we may as well compare against one.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-05-09 14:19:50 -04:00
Casey Bodley
67fe5d25a7
common: add an async SharedMutex
...
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2018-05-09 13:49:54 -04:00
Casey Bodley
acf1374f88
common: forward_handler() for handlers with move-only args
...
executors will always call the handler's lvalue overload of operator(),
so forward_handler() is required to wrap calls to bind_handler() with
move-only argument types. Completion uses this to forward all of its
CompletionHandlers
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2018-05-09 13:40:16 -04:00
Casey Bodley
4b7ca701c7
common: add a generic async Completion interface
...
a generic Completion for storing asio completion handlers for deferred
execution
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2018-05-09 13:40:16 -04:00
Adam C. Emerson
f9c5e28225
build: Remove -Wno-invalid-offsetof
...
Since C++17 relaxed the rules for using offsetof, this is no longer needed.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-05-09 13:26:29 -04:00
Adam C. Emerson
c876618931
tools: Do not memset uuid_d
...
It is perfectly able to default initialize itself.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-05-09 13:26:29 -04:00
Adam C. Emerson
ff189df08f
test/rbd/fsx: Disable overflow-format warning
...
No return type or other way to react to it.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-05-09 13:26:29 -04:00