Casey Bodley
fd2a016d48
Merge pull request #17254 from joscollin/wip-cleanup-rgw-override
...
rgw: add missing override in list_keys_init()
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-08-29 10:10:49 -04:00
Sage Weil
bff93b0447
Merge pull request #17311 from hjwsm1989/wip-monop-tracker
...
mon: use ceph_clock_now if message is self-generated
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-29 08:40:16 -05:00
Sage Weil
af10bae469
Merge pull request #17330 from xiexingguo/wip-class-rename-idempotent
...
mon/OSDMonitor: make 'osd crush class rename' idempotent
Reviewed-by: Sage Weil <sage@redhat.com>
2017-08-29 08:38:53 -05:00
Yehuda Sadeh
9bfd96e43f
Merge pull request #16863 from mikulely/fix-curl-referer
...
rgw: fix opslog can't record referrer when using curl as client
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-08-29 16:38:45 +03:00
Yehuda Sadeh
c40f645cc5
Merge pull request #16860 from mikulely/fix-opslog
...
rgw: fix opslog cannot record remote_addr
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-08-29 16:33:42 +03:00
Yehuda Sadeh
b4ea9d0aba
Merge pull request #16933 from amitkumar50/cov-rgw-3
...
rgw: Initialize is_master, max_aio, size
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-08-29 16:31:14 +03:00
Yehuda Sadeh
d2e598a374
Merge pull request #17185 from oritwas/wip-rgw-20777
...
rgw-admin: require --yes-i-really-mean-it when using --inconsistent_index
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-08-29 15:45:23 +03:00
Kefu Chai
51bd7a5fd2
Merge pull request #16774 from yanyixing/fix-sidenav
...
mgr/dashboard: fix rbd's pool sub menu
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-29 16:29:16 +08:00
Mykola Golub
d44bdd4810
Merge pull request #17283 from liupan1111/wip-final-nbd
...
rbd-nbd: cleanup for NBDServer shut down
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-08-29 09:34:32 +03:00
Kefu Chai
0d48203d2d
Merge pull request #17269 from liewegas/wip-health
...
mon: fix two stray legacy get_health() callers
Reviewed-by: Kefu Chai <kchai@redhat.com
2017-08-29 11:32:04 +08:00
Josh Durgin
655a937dde
Merge pull request #17328 from tchaikov/wip-kill-gcc-warning
...
test/unittest_pg_log: silence gcc warning
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-08-28 20:26:31 -07:00
Sage Weil
a33d0ef3f1
Merge pull request #17146 from shangzhong/wip-add-line-break
...
common: add line break for "ceph daemon TYPE.ID version"
Reviewed-by: huanwen ren <ren.huanwen@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-28 21:58:28 -05:00
Sage Weil
cc7c9e9ee4
Merge pull request #17091 from liupan1111/wip-txc-add
...
os/bluestore: support calculate cost when using spdk.
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-08-28 21:56:32 -05:00
Sage Weil
fc72223fa1
Merge pull request #17251 from Songweibin/wip-unused-variable
...
os/bluestore: drop unused param "what" in apply()
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-28 21:55:52 -05:00
xie xingguo
2ee80aead8
mon/OSDMonitor: make 'osd crush class rename' idempotent
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-29 10:43:35 +08:00
Kefu Chai
219183e2fb
test/unittest_pg_log: silence gcc warning
...
this silences following warning:
In file included from ceph/src/test/osd/TestPGLog.cc:24:0:
ceph/src/googletest/googletest/include/gtest/gtest.h:430:16:
warning: ‘virtual void testing::Test::SetUp()’ was hidden
[-Woverloaded-virtual]
virtual void SetUp();
^~~~~
ceph/src/test/osd/TestPGLog.cc:2703:8: warning: by ‘void
PGLogTrimTest::SetUp(unsigned int, unsigned int, unsigned int)’
[-Woverloaded-virtual]
void SetUp(unsigned min_entries, unsigned max_entries, unsigned
dup_track) {
^~~~~
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-08-29 10:16:58 +08:00
Kefu Chai
4a506f565e
Merge pull request #17326 from neha-ojha/wip-21023-contd
...
doc: fix order of options in osd new
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-29 10:02:55 +08:00
Kefu Chai
958c8480ea
Merge pull request #17180 from tchaikov/wip-literals-for-options
...
common/options: use user-defined literals for default values
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
2017-08-29 09:25:33 +08:00
Kefu Chai
4324ad9955
Merge pull request #16066 from tanghaodong25/bluefs-sync-write
...
os/bluestore/BlueFS: don't need wait for aio when using _sync_write
Reviewed-by: Sage Weil <sage@redhat.com>
2017-08-29 09:12:47 +08:00
Kefu Chai
a8124b1c6f
Merge pull request #15479 from yonghengdexin735/wip-zzz-const
...
messages/MDentryLink: add const to member function
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-29 09:11:58 +08:00
Kefu Chai
9c1c2dde22
Merge pull request #17256 from scienceluo/wip-luo-add-log-branch
...
auth: add err reason for log info in load function
Reviewed-by: Sage Weil <sage@redhat.com>
2017-08-29 09:11:22 +08:00
Neha Ojha
e474630289
doc: fix order of options in osd new
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2017-08-28 15:59:19 -07:00
Sage Weil
df3fe608b8
Merge pull request #17307 from liewegas/wip-powercycle-slow-trim
...
qa/suites/powercycle/osd/whitelist_health: whitelist slow trimming
2017-08-28 13:14:16 -05:00
Sage Weil
5235f35ac8
qa/suites/powercycle/osd/whitelist_health: whitelist more
...
"2017-08-26 16:09:27.704418 mon.a mon.0 172.21.15.169:6789/0 876 : cluster [WRN] MDS health message (mds.0): Behind on trimming (66/30)" in cluster log
Signed-off-by: Sage Weil <sage@redhat.com>
2017-08-28 13:58:02 -04:00
John Spray
bc2daa6ee9
Merge pull request #16857 from yanyixing/chartfix
...
pybind: fix chart size become bigger when refresh
Reviewed-by: John Spray <john.spray@redhat.com>
2017-08-28 18:28:34 +01:00
Matt Benjamin
315e419181
Merge pull request #17267 from linuxbox2/wip-lock-qlane
...
rgw_file: fix LRU lane lock in evict_block()
2017-08-28 11:01:03 -04:00
huangjun
56e8031dac
mon: use ceph_clock_now if message is self-generated
...
Signed-off-by: huangjun <huangjun@xsky.com>
2017-08-28 22:52:37 +08:00
Sage Weil
0f5da4afc1
Merge pull request #17293 from tchaikov/wip-jewel-x-singleton
...
qa/suites/rados/upgrade/jewel-x-singleton: tolerate sloppy past_intervals
Reviewed-by: Sage Weil <sage@redhat.com>
2017-08-28 08:55:18 -05:00
Kefu Chai
4fba9c0ee2
Merge pull request #17019 from dachary/wip-doc-ceph-disk
...
doc: document ceph-disk prepare class hierarchy
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-28 19:17:33 +08:00
Kefu Chai
b2d7f4f4c7
qa/suites/rados/upgrade/jewel-x-singleton: tolerate sloppy past_intervals
...
See-also: d5d5d7d1
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-08-28 15:19:41 +08:00
Pan Liu
0bef6c7753
Merge pull request #17284 from liupan1111/wip-nvme-cleanup
...
bluestore/NVMEDevice: code cleanup
2017-08-28 10:01:58 +08:00
Xie Xingguo
3e0506a9a5
Merge pull request #17253 from hjwsm1989/fix-qa-bug
...
qa: fix the potential delay of pg state change
Reviewed-by: Sage Weil <sage@redhat.com>
2017-08-28 08:35:01 +08:00
Pan Liu
54383e8bd9
bluestore/NVMEDevice: remove useless IOSegment, and set
...
dpdk_thread_adaptor as static.
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
Signed-off-by: Ziye Yang <optimistyzy@intel.com>
2017-08-27 23:23:00 +08:00
Pan Liu
8b80a9ba7d
bluestore/NVMEDevice: remove useless aio_stop in class NVMEDevice
...
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
2017-08-27 23:06:55 +08:00
Pan Liu
455e7435f7
os/bluestore/NVMEDevice: remove not used BufferedExtents.
...
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
2017-08-27 23:03:15 +08:00
Pan Liu
622e90edd2
rbd-nbd: don't need call "stop()" seperately, and ~NBDServer will do it.
...
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
2017-08-27 20:45:10 +08:00
Jason Dillaman
fc0646fa6d
Merge pull request #17055 from dillaman/wip-21017
...
mgr/dashboard: fix duplicate images listed on iSCSI status page
Reviewed-by: John Spray <john.spray@redhat.com>
2017-08-27 08:39:18 -04:00
Jason Dillaman
f2092a9d32
Merge pull request #17216 from Yan-waller/wip-walle-0824imagectx
...
test/librbd: fix mock method macro of set_journal_policy
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-08-27 08:33:35 -04:00
Sage Weil
64dcb9c3d0
Merge pull request #17275 from ceph/revert-17268-wip-21089
...
Revert "os/bluestore: compensate for bad freelistmanager size/blocks metadata"
Reviewed-by: Sage Weil <sage@redhat.com>
2017-08-26 21:22:04 -05:00
Kefu Chai
30b5b4627c
Merge pull request #16494 from asomers/bin_bash
...
misc: Fix bash path in shebangs
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-27 10:14:14 +08:00
Xie Xingguo
303d5b34a5
Revert "os/bluestore: compensate for bad freelistmanager size/blocks metadata"
2017-08-27 10:12:46 +08:00
Xie Xingguo
dbe1e6ed6c
Merge pull request #17268 from liewegas/wip-21089
...
os/bluestore: compensate for bad freelistmanager size/blocks metadata
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-27 09:38:14 +08:00
Xie Xingguo
d0402b1175
Merge pull request #17271 from xiexingguo/wip-ls-by-class
...
mon/MonCommands: fix copy-and-paste error
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-27 09:36:09 +08:00
Xie Xingguo
df81aa4643
Merge pull request #17272 from scienceluo/wip-luo-silence-buiding-warning-branch
...
common: silence jenkins's buiding warning in obj_bencher.cc
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-27 09:34:58 +08:00
Pan Liu
82e7dee3ff
Merge pull request #17200 from optimistyzy/823_queue_depth
...
os/bluestore/NVMEDevice: fix the nvme queue depth issue
2017-08-26 22:29:54 +08:00
Luo Kexue
6ed6883b49
common: silence jenkins's buiding warning in obj_bencher.cc
...
Signed-off-by: Luo Kexue <luo.kexue@zte.com.cn>
2017-08-26 10:58:39 +08:00
xie xingguo
49e293d552
mon/MonCommands: fix copy-and-paste error
...
Class is definitely required by default for the "crush rule ls-by-class"
command.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-26 10:09:11 +08:00
Xie Xingguo
3619904fb1
Merge pull request #17270 from liewegas/wip-luminous-note
...
doc/release-notes: clarify purpose of require-osd-release
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-26 09:11:13 +08:00
Ziye Yang
09e4513c29
NVMEDevice: fix the nvme queue depth issue
...
We need to track the queue depth usage for each qpair to
prevent submit too many I/Os. If there are too many requests,
we need to poll the qpair, to make sure there is enough slots
for next I/O submit.
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
2017-08-26 08:07:32 +08:00
Sage Weil
ba38d3c337
doc/release-notes: clarify purpose of require-osd-release
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-08-25 18:48:09 -04:00