]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Sage Weil [Thu, 8 Jun 2017 22:12:02 +0000 (18:12 -0400)]
pybind/mgr/dashboard: monkeypatch os.exit to stop cherrypy from taking down mgr
Fixes: http://tracker.ceph.com/issues/20216
Suggested-by: Tim Serong <tserong@suse.com>
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 8 Jun 2017 22:07:22 +0000 (17:07 -0500)]
Merge pull request #15405 from liewegas/wip-rest-test
pybind/mgr/restful: improve cert handling; work with vstart
Reviewed-by: Boris Ranto <branto@redhat.com>
Sage Weil [Thu, 8 Jun 2017 17:49:30 +0000 (13:49 -0400)]
debian/control: Build-Depends on python-pecan
This is needed for make check (so that restful mgr module can load).
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 8 Jun 2017 20:45:52 +0000 (15:45 -0500)]
Merge pull request #15557 from liewegas/wip-mgr-respawn
mgr/MgrStandby: respawn when deactivated
Reviewed-by: John Spray <john.spray@redhat.com>
Casey Bodley [Thu, 8 Jun 2017 20:01:47 +0000 (16:01 -0400)]
Merge pull request #15301 from shashalu/rgw-ssl
rgw: add "rgw_verify_ssl" config
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Casey Bodley [Thu, 8 Jun 2017 20:00:02 +0000 (16:00 -0400)]
Merge pull request #15257 from shashalu/fix-rgw-admin-retcode
rgw: fix radosgw-admin retcode
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Casey Bodley [Thu, 8 Jun 2017 19:59:20 +0000 (15:59 -0400)]
Merge pull request #14950 from fangyuxiangGL/set-obj-accounted-size
rgw: set object accounted size correctly
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Sage Weil [Mon, 5 Jun 2017 20:15:43 +0000 (16:15 -0400)]
mgr/Mgr: fix deadlock in load_config
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 5 Jun 2017 19:43:18 +0000 (15:43 -0400)]
pybind/mgr/dashboard: get_localized_config for server_{addr,port}
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 1 Jun 2017 14:34:06 +0000 (10:34 -0400)]
qa/workunits/rest/test_mgr_rest_api.py: improvements
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 2 Jun 2017 14:25:00 +0000 (10:25 -0400)]
pybind/mgr/restful: store each key+pass in a separate key
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 2 Jun 2017 14:31:41 +0000 (10:31 -0400)]
pybind/mgr/restful: prefix commands with 'restful'
And use - instead of _, following the ceph convention.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 2 Jun 2017 14:24:39 +0000 (10:24 -0400)]
mgr: add get_config_prefix
Fetch a dict of all config options with a given prefix.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 2 Jun 2017 14:05:54 +0000 (10:05 -0400)]
pybind/mgr/restful: localize key/crt keys
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 2 Jun 2017 14:05:08 +0000 (10:05 -0400)]
mgr/PyState: add get_mgr_id() to module interface
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 2 Jun 2017 13:50:18 +0000 (09:50 -0400)]
mgr/PyModules: prefix by mgr/, not mgr/$id/
If modules want per-instance state, they can include
the mgr id in their portion of the key name.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 1 Jun 2017 20:33:42 +0000 (16:33 -0400)]
mon/ConfigKeyService: more useful status message
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 1 Jun 2017 04:06:24 +0000 (00:06 -0400)]
vstart.sh: start up mgr restful API
We try to stagger the ports that mgr modules bind to so that
concurrent vstart instances can run with consecutive ports but
the services will not collide. Yes, this is awkward.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 1 Jun 2017 04:05:09 +0000 (00:05 -0400)]
pybind/mgr/restful: all crt/key or filename in config-key
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 1 Jun 2017 03:29:11 +0000 (23:29 -0400)]
ceph.spec.in: add python-pecan as BuildDepends too
For install-deps.sh's benefit.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 1 Jun 2017 03:23:24 +0000 (23:23 -0400)]
vstart.sh: load 'restful' (not 'rest') mgr module
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 2 Jun 2017 03:05:17 +0000 (23:05 -0400)]
test/vstart_wrapper.sh: fix MGR_PYTHON_PATH
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 23 May 2017 19:06:49 +0000 (15:06 -0400)]
vstart.sh: start mgr dashboard, echo URL(s)
Signed-off-by: Sage Weil <sage@redhat.com>
Yehuda Sadeh [Thu, 8 Jun 2017 18:26:44 +0000 (11:26 -0700)]
Merge pull request #15507 from zhangsw/fix-rgw-logtrim-bug
rgw: datalog trim and mdlog trim handles the result returned by osd incorrectly.
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Sage Weil [Thu, 8 Jun 2017 18:15:52 +0000 (13:15 -0500)]
Merge pull request #15102 from majianpeng/blockdevice-pmem
os/bluestore/BlockDevice: support pmem device as bluestore backend
Reviewed-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Thu, 8 Jun 2017 17:56:19 +0000 (13:56 -0400)]
Merge pull request #15577 from jcsp/wip-dashboard-cleanup
mgr: dashboard code cleanup
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
John Spray [Thu, 8 Jun 2017 12:57:50 +0000 (08:57 -0400)]
mgr/dashboard: remove confusing SyncObject stuff
This was a hangover from when these wrapper classes
were borrowed from Calamari, which used these
versions/equality functions to work out when
to go fetch data from the ceph cluster.
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Thu, 8 Jun 2017 12:06:12 +0000 (08:06 -0400)]
mgr/dashboard: fix server view on funny version format
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Wed, 7 Jun 2017 16:50:38 +0000 (12:50 -0400)]
mgr/dashboard: fix error handling in remote_view_cache
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Wed, 7 Jun 2017 16:48:40 +0000 (12:48 -0400)]
mgr/dashboard: keep a global librados instance
...so that classes that need one aren't creating
their own all the time.
Signed-off-by: John Spray <john.spray@redhat.com>
Kefu Chai [Thu, 8 Jun 2017 15:10:51 +0000 (23:10 +0800)]
Merge pull request #15566 from baruza/wip-doc-20199
doc: Change the default values of some OSD options
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Thu, 8 Jun 2017 15:02:54 +0000 (10:02 -0500)]
Merge pull request #15485 from ceph/wip-hdd-throttle-cost
common/config_opts.h: Lower HDD throttle cost.
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Thu, 8 Jun 2017 14:59:11 +0000 (22:59 +0800)]
Merge pull request #15203 from Liuchang0812/wip-kill-broken-links
doc: kill some broken links
Reviewed-by: Kefu Chai <kchai@redhat.com>
Gregory Farnum [Thu, 8 Jun 2017 13:55:37 +0000 (06:55 -0700)]
Merge pull request #15575 from liewegas/wip-pgnls-note
PendingReleaseNotes: notes on whiteouts vs pgnls
Sage Weil [Thu, 8 Jun 2017 13:52:34 +0000 (08:52 -0500)]
Merge pull request #15309 from ifed01/wip-bluestore-boost-statfs
os/bluestore: keep statfs replica in RAM to avoid expensive KV retrieval
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 8 Jun 2017 13:41:25 +0000 (09:41 -0400)]
PendingReleaseNotes: notes on whiteouts vs pgnls
Signed-off-by: Sage Weil <sage@redhat.com>
Mykola Golub [Thu, 8 Jun 2017 11:42:29 +0000 (14:42 +0300)]
Merge pull request #15532 from dillaman/wip-rbd-mirror-stress
rbd-mirror: lock loss during sync should wait for in-flight copies
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Mykola Golub [Thu, 8 Jun 2017 11:41:51 +0000 (14:41 +0300)]
Merge pull request #15518 from dillaman/wip-rbd-missing-default-pool
rbd: removed hardcoded default pool
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Igor Fedotov [Thu, 13 Apr 2017 14:51:33 +0000 (17:51 +0300)]
os/bluestore: introduce a debug switch to bypass kv update.
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
Igor Fedotov [Fri, 26 May 2017 12:55:47 +0000 (05:55 -0700)]
os/bluestore: introduce debug parameter to bypass bdev verification
E.g. this allows to backup WAL/DB volumes after preconditioning and quickly rollback to that state when needed.
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
Igor Fedotov [Fri, 26 May 2017 12:33:05 +0000 (15:33 +0300)]
os/bluestore: keep statfs replica in memory to avoid expensive KV access
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
Igor Fedotov [Fri, 26 May 2017 12:07:28 +0000 (15:07 +0300)]
os/bluestore: move volatile_statfs struct out of TransContext
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
Loic Dachary [Thu, 8 Jun 2017 10:52:31 +0000 (12:52 +0200)]
Merge pull request #15433 from wjwithagen/wip-wjw-prettytable
ceph-disk: add setting for external py-modules for tox-testing
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Barbora Ančincová [Wed, 7 Jun 2017 10:10:53 +0000 (12:10 +0200)]
doc: Change the default values of some OSD options
These values were changed to reflect this change
a3f9cba
Fixes: http://tracker.ceph.com/issues/20199
Signed-off-by: Bara Ancincova <bara@redhat.com>
Willem Jan Withagen [Fri, 2 Jun 2017 14:53:43 +0000 (16:53 +0200)]
ceph-disk: use system modules if needed
- prettytable usage was introduced in:
https://github.com/ceph/ceph/commit/
3fa8bb1
It is in the install-deps.sh file to be installed, but
it is not per default installed in the testenvironment
So allow tox tests to use "external" modules
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
Kefu Chai [Thu, 8 Jun 2017 01:57:26 +0000 (09:57 +0800)]
Merge pull request #14866 from chardan/jfw-wip-halflife_atomic_t-varan
common,test: migrate atomic_t to std::atomic
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Wed, 7 Jun 2017 22:08:32 +0000 (17:08 -0500)]
Merge pull request #15520 from liewegas/wip-max-object-size
osd: reduce rados_max_object_size from 100 GB -> 128 MB
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Sage Weil [Tue, 6 Jun 2017 18:56:35 +0000 (14:56 -0400)]
osd: reduce rados_max_object_size from 100 GB -> 128 MB
I'm not sure why we had this so huge! 128 MB is a pretty reasonable size.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 7 Jun 2017 21:00:30 +0000 (16:00 -0500)]
Merge pull request #15230 from chardan/jfw-wip-halflife_atomic_t-xio
xio: migrate atomic_t to std::atomic<>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Wed, 7 Jun 2017 21:00:10 +0000 (16:00 -0500)]
Merge pull request #15516 from javacruft/i386-cmake-fixes
cmake: misc fixes for build on i386
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Wed, 7 Jun 2017 20:59:54 +0000 (15:59 -0500)]
Merge pull request #15525 from wjwithagen/wip-wjw-clang-testosdmap
test: osd/TestOSDMap.cc: fix Clang complain about promotion
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Wed, 7 Jun 2017 20:54:19 +0000 (16:54 -0400)]
mgr/MgrStandby: respawn when deactivated
- It is ugly to unwind all of the Mgr state so that we can reactivate
later.
- It is perhaps impossible to do shut down the python state reliably.
- Respawning provides a clean state and is reliable.
This mostly just copies MDSServer::respawn().
Fixes: http://tracker.ceph.com/issues/19595
Fixes: http://tracker.ceph.com/issues/19549
Signed-off-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Tue, 6 Jun 2017 17:24:54 +0000 (13:24 -0400)]
rbd: removed hardcoded default rbd pool name
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Tue, 6 Jun 2017 13:40:13 +0000 (09:40 -0400)]
rbd-nbd: removed default rbd pool name
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Tue, 6 Jun 2017 13:39:18 +0000 (09:39 -0400)]
rbd-replay: removed default rbd pool name
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Tue, 6 Jun 2017 13:38:09 +0000 (09:38 -0400)]
pybind/rbd: module should depend on librbd not rbd CLI
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Tue, 6 Jun 2017 02:08:01 +0000 (22:08 -0400)]
common: new 'rbd_default_pool' configuration option
The 'rbd' pool will no longer be automatically created. Allow
the user to specify a custom default RBD pool name.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Wed, 7 Jun 2017 14:52:24 +0000 (10:52 -0400)]
rbd-mirror: narrowed scope of exclusive lock op tracking
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Wed, 7 Jun 2017 14:06:59 +0000 (10:06 -0400)]
rbd-mirror: partial revert of
649b29d
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Adam C. Emerson [Wed, 7 Jun 2017 17:29:28 +0000 (13:29 -0400)]
Merge pull request #15498 from adamemerson/wip-fixation
test: Fix narrowing conversion
rgw: Support certain archaic and antiquated distributions
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Wed, 7 Jun 2017 16:36:59 +0000 (09:36 -0700)]
Merge pull request #15436 from liewegas/wip-versions
mon: {mon,osd,mds} {versions,count-metadata}
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Wed, 7 Jun 2017 16:17:39 +0000 (11:17 -0500)]
Merge pull request #15501 from liewegas/wip-blocked-is-err
mon/PGMap: call blocked requests ERR not WARN
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Sage Weil [Wed, 7 Jun 2017 16:16:58 +0000 (12:16 -0400)]
mon/PGMap: call requests blocked for 128x as long ERR not WARN
- rename the option (max -> warn)
- add an err_..._ratio multiplier
- switch to HEALTH_ERR once requests are blocked long enough
- make the error ratio high (default is 32*128s -> about an hour) so that
we don't trigger on a heavily loaded cluster.
Signed-off-by: Sage Weil <sage@redhat.com>
Adam C. Emerson [Mon, 5 Jun 2017 19:46:45 +0000 (15:46 -0400)]
rgw: Support certain archaic and antiquated distributions
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Adam C. Emerson [Mon, 5 Jun 2017 19:33:31 +0000 (15:33 -0400)]
test: Fix narrowing conversion
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Jianpeng Ma [Wed, 7 Jun 2017 15:22:52 +0000 (23:22 +0800)]
os/bluestore/BlockDevice:support pmem device as bluestore backend.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Sage Weil [Wed, 7 Jun 2017 14:48:57 +0000 (09:48 -0500)]
Merge pull request #15531 from liewegas/wip-osd-pglog
osd: rename osd -> osd_pglog; include pglog-related bufferlists
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Wed, 7 Jun 2017 01:57:04 +0000 (21:57 -0400)]
osd/osd_types: put pg_log_entry_t::extra_reqids in osd_pglog mempool
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 6 Jun 2017 20:55:23 +0000 (16:55 -0400)]
osd: put pg_log_entry_t::snaps in osd_pglog mempool
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 6 Jun 2017 20:50:22 +0000 (16:50 -0400)]
osd: map ObjectModDesc to osd_pglog pool
This can consume significant space for EC pools.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 6 Jun 2017 20:49:11 +0000 (16:49 -0400)]
osd: move pglog to osd_pglog mempool
This actually everything in the osd mempool, so it's basically a rename.
Signed-off-by: Sage Weil <sage@redhat.com>
Kefu Chai [Wed, 7 Jun 2017 14:34:43 +0000 (22:34 +0800)]
Merge pull request #15413 from tchaikov/wip-rgw-boost-cleanup
rgw: drop asio/{yield,coroutine}.hpp replacements
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Sage Weil [Wed, 7 Jun 2017 14:07:45 +0000 (09:07 -0500)]
Merge pull request #15434 from yuyuyu101/wip-lz4
compressor: add LZ4 support
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 7 Jun 2017 14:05:58 +0000 (09:05 -0500)]
Merge pull request #15512 from jcsp/wip-mgrmap-epoch
mon: don't prefix mgr summary with epoch number
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 7 Jun 2017 14:02:29 +0000 (09:02 -0500)]
Merge pull request #15437 from dachary/wip-bluestore
ceph-disk: add --filestore argument, default to --bluestore
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 7 Jun 2017 13:43:08 +0000 (08:43 -0500)]
Merge pull request #15547 from wjwithagen/wip-wjw-freebsd-get_device_by_fd
common/blkdev.cc: propagate get_device_by_fd to different OSes
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 7 Jun 2017 13:41:41 +0000 (08:41 -0500)]
Merge pull request #15435 from liewegas/wip-bluestore-warning
os/bluestore: fix warning
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Sage Weil [Wed, 7 Jun 2017 13:31:46 +0000 (08:31 -0500)]
Merge pull request #15371 from liewegas/wip-mon-client-features
mon: track features from connect clients, and use it to gate set-require-min-compat-client
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Willem Jan Withagen [Wed, 7 Jun 2017 09:21:57 +0000 (11:21 +0200)]
common/blkdev.cc: propagate get_device_by_fd to different OSes
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
Kefu Chai [Wed, 7 Jun 2017 08:44:54 +0000 (16:44 +0800)]
Merge pull request #15530 from tchaikov/wip-jq-without-first
qa/workunits/ceph-helpers.sh: use syntax understood by jq 1.3
Reviewed-by: David Zafman <dzafman@redhat.com>
liuchang0812 [Mon, 22 May 2017 11:56:33 +0000 (19:56 +0800)]
doc: kill some broken links
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
Kefu Chai [Wed, 7 Jun 2017 05:09:45 +0000 (13:09 +0800)]
Merge pull request #15423 from liewegas/wip-fix-indent
mon/FSCommand: fix indentation
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 7 Jun 2017 04:30:06 +0000 (12:30 +0800)]
Merge pull request #15497 from liewegas/wip-log-last
mon/LogMonitor: 'log last' command
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 7 Jun 2017 04:20:57 +0000 (12:20 +0800)]
Merge pull request #15522 from liewegas/wip-19901
ceph_test_rados_api_misc: fix LibRadosMiscConnectFailure.ConnectFailure retry
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Tue, 30 May 2017 22:29:03 +0000 (18:29 -0400)]
mon/OSDMonitor: validate set-require-min-compat-client against connected clients
Prevent the user from setting a require_min_compat_client if a disallowed
client is currently connected to the mon cluster. Instead, you'll get an
error like
Error EPERM: cannot set require_min_compat_client to luminous: 1 connected client(s) look like jewel (missing 0x800000000200000); add --yes-i-really-mean-it to do it anyway
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 30 May 2017 22:18:41 +0000 (18:18 -0400)]
common: ceph_release_[from_]features
Map releases to client features (and back again).
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 30 May 2017 20:37:22 +0000 (16:37 -0400)]
mon: add 'features' command to show connected client features
for whole mon cluster
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 7 Jun 2017 03:09:46 +0000 (22:09 -0500)]
Merge pull request #15422 from liewegas/wip-osd-rotational
osd: hdd vs ssd defaults for osd op thread pool
Reviewed-by: Mark Nelson <mnelson@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Sage Weil [Wed, 7 Jun 2017 03:07:32 +0000 (22:07 -0500)]
Merge pull request #15517 from liewegas/wip-20197
qa/suites/rados/upgrade: restart mds
Sage Weil [Wed, 7 Jun 2017 03:04:48 +0000 (22:04 -0500)]
Merge pull request #15523 from ceph/wip-16674
selinux: Allow read on var_run_t
Reviewed-by: Kefu Chai <kchai@redhat.com>
Zhang Shaowen [Tue, 6 Jun 2017 07:43:20 +0000 (15:43 +0800)]
rgw: datalog trim and mdlog trim handles the result returned by osd
incorrectly.
Fixes: http://tracker.ceph.com/issues/20190
Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Kefu Chai [Wed, 7 Jun 2017 01:32:19 +0000 (09:32 +0800)]
qa/workunits/ceph-helpers.sh: use syntax understood by jq 1.3
trusty still ships jq 1.3 which does not offer "first". see
https://stedolan.github.io/jq/manual/v1.3/ .
Signed-off-by: Kefu Chai <kchai@redhat.com>
Jason Dillaman [Wed, 7 Jun 2017 00:56:49 +0000 (20:56 -0400)]
Merge pull request #14745 from trociny/wip-18789
rbd-mirror: coordinate image syncs with leader
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Haomai Wang [Wed, 7 Jun 2017 00:32:53 +0000 (08:32 +0800)]
Merge pull request #15243 from yuyuyu101/wip-20049
msg: don't set msgr addr when disabing client bind
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yehuda Sadeh [Wed, 7 Jun 2017 00:18:39 +0000 (17:18 -0700)]
Merge pull request #14117 from zhangsw/fix-rgw-getobjectmetadata-bug
rgw: return the version id in get object and object metadata request.
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Josh Durgin [Tue, 6 Jun 2017 22:48:04 +0000 (15:48 -0700)]
Merge pull request #15386 from ivancich/wip-add-readme-that-dmclock-is-a-subtree
doc: add README to dmclock subdir to inform developers it's a git subtree
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Tue, 6 Jun 2017 22:18:51 +0000 (15:18 -0700)]
Merge pull request #15392 from dillaman/wip-20049
msg: do not enable client-side binding by default
Reviewed-by: Haomai Wang <haomai@xsky.com>
Willem Jan Withagen [Tue, 6 Jun 2017 21:35:18 +0000 (23:35 +0200)]
test: osd/TestOSDMap.cc: fix Clang complain about promotion
/home/jenkins/workspace/ceph-freebsd/src/test/osd/TestOSDMap.cc:444:15: error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'int' in initializer list [-Wc++11-narrowing]
m.set(x, {i});
^
/home/jenkins/workspace/ceph-freebsd/src/test/osd/TestOSDMap.cc:444:15: note: insert an explicit cast to silence this issue
m.set(x, {i});
^
static_cast<int>( )
1 error generated.
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
Sage Weil [Tue, 6 Jun 2017 20:31:22 +0000 (15:31 -0500)]
Merge pull request #15513 from Fabian-Gruenbichler/fixmgrdesc
debian: ceph-mgr: fix package description
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
Sage Weil [Tue, 6 Jun 2017 20:27:07 +0000 (15:27 -0500)]
Merge pull request #15375 from ivancich/wip-fix-dmclock-testing
osd/dmclock/testing: reorganize testing, building now optional
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>