Yuri Weinstein
bd27b2e76a
Merge pull request #16807 from fangyuxiangGL/revert-8765
...
rgw: revert PR #8765
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-08-21 08:57:50 -07:00
Yuri Weinstein
9d781cc8b1
Merge pull request #17024 from cbodley/wip-20906
...
cls/log: cls_log_list always returns next marker
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-08-21 08:56:30 -07:00
Yuri Weinstein
90e8071106
Merge pull request #17048 from theanalyst/rgw-fix-get-obj-tag-attr
...
rgw: rgw_op: exit early if object has no attrs in GetObjectTagging
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-08-21 08:54:56 -07:00
Yuri Weinstein
b848dd3ac8
Merge pull request #17050 from theanalyst/rgw-iam-get-bucket-acl
...
rgw: evaluate the correct bucket action for GetACL bucket operation
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2017-08-21 08:53:25 -07:00
David Zafman
9069f663f7
Merge pull request #17098 from dzafman/wip-runs-core
...
tests: run-standalone.sh skip core_pattern if already set
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2017-08-21 08:21:13 -07:00
Kefu Chai
1cb188db01
Merge pull request #17044 from baruza/wip-doc-21007
...
doc: Improve the ceph fs set max_mds command
Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-21 22:53:46 +08:00
Barbora Ančincová
2e46cc706e
doc: Improve the ceph fs set max_mds command
...
Fixes: http://tracker.ceph.com/issues/21007
Signed-off-by: Bara Ancincova <bara@redhat.com>
2017-08-21 16:37:40 +02:00
Pan Liu
6b9a64165e
Merge pull request #17112 from optimistyzy/821_spdk
...
NVMDevice: fix issued caused by #17002
2017-08-21 20:30:32 +08:00
Alfredo Deza
072d8cad8c
Merge pull request #17107 from Songweibin/wip-spell
...
misc fix spell errors in osd/OSD and doc
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-08-21 07:38:24 -04:00
Abhishek L
5f6b92593f
Merge pull request #17105 from iliul/add-mailmap-affiliation
...
.mailmap, .organizationmap: Add Liu Lei's mailmap and affiliation
Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-By: Jos Collin <jcollin@redhat.com>
2017-08-21 12:54:54 +02:00
Jos Collin
e86ea5ae25
Merge pull request #17109 from ashishkumsingh/add-mailmap-affiliation
...
organizationmap: Add Ashish Singh affiliation
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-08-21 10:42:24 +00:00
Ashish Singh
eaac2d5918
organizationmap: Ashish Singh affiliation
...
Signed-off-by: Ashish Singh <assingh@redhat.com>
2017-08-21 18:17:09 +05:30
Ziye Yang
2a3256a354
NVMDevice: fix issued caused by #17002
...
Patch #17002 breaks running osd when using spdk, and
this patch can fix this.
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
2017-08-21 18:37:49 +08:00
Venky Shankar
e5947ee88a
Merge pull request #17078 from dillaman/wip-21029
...
test/librbd: TestMirroringWatcher unit tests should ignore duplicates
2017-08-21 13:35:58 +05:30
Kefu Chai
053f6a6cb6
Merge pull request #16647 from tchaikov/wip-osd-exit-directly-on-failure
...
osd: exit(1) directly without lock if init fails
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-21 15:56:45 +08:00
songweibin
f3b39ac8e0
doc: fix a spell error and modify layout
...
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2017-08-21 14:58:15 +08:00
songweibin
f1567a0fe2
osd/OSD: fix spell errors
...
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2017-08-21 14:58:15 +08:00
iliul
b0d4832314
.mailmap, .organizationmap: Add Liu Lei's mailmap and affiliation
...
Signed-off-by: iliul <liul124@chinaunicom.cn>
2017-08-21 10:47:37 +08:00
Haomai Wang
e7ec34bd89
Merge pull request #17086 from optimistyzy/818_write
...
bluestore/NVMEDevice: fix the bug in write function
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-08-21 09:49:57 +08:00
Kefu Chai
572575c3f7
Merge pull request #17104 from iliul/fix-duplicate-words
...
doc: delete duplicate words
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-20 18:16:34 +08:00
iliul
de19b555fa
doc: delete duplicate words
...
Signed-off-by: iliul <liul124@chinaunicom.cn>
2017-08-20 17:30:55 +08:00
Kefu Chai
e407049a6a
Merge pull request #17060 from cyx1231st/fix_reqid_assignment_in_oprequest
...
osd: fix reqid assignment for reply messages in OpRequest
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-20 14:00:26 +08:00
Kefu Chai
d81816f969
Merge pull request #16687 from Songweibin/wip-xml-format
...
common: adding line break at end of some cli results
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-08-20 13:59:22 +08:00
Kefu Chai
257718556f
Merge pull request #15118 from squidboylan/fix_15872
...
debian: lock ceph user during purge
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-20 10:16:43 +08:00
Kefu Chai
802e43bec8
Merge pull request #17059 from tchaikov/wip-optional-lz4
...
compressor: conditionalize on HAVE_LZ4
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-08-20 09:53:24 +08:00
Xie Xingguo
5b7c65d904
Merge pull request #17015 from lixiaoy1/lat_fix
...
os/bluestore: Add lat record of deferred_queued and deferred_aio_wait
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-19 21:01:47 +08:00
Xie Xingguo
89d28a176c
Merge pull request #16955 from xiexingguo/wip-app-ls
...
mon/OSDMonitor: "osd pool application get" support
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-08-19 17:49:43 +08:00
Xie Xingguo
e0e255f48e
Merge pull request #17064 from xiexingguo/wip-20970
...
mon/PGMap: reweight::by_utilization - skip DNE osds
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-19 17:46:50 +08:00
Xie Xingguo
bda001fd2d
Merge pull request #17067 from renhwztetecs/renhw-wip-mon-cleanup
...
mon: some cleanup
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2017-08-19 17:43:49 +08:00
David Zafman
4ea1cd2a4e
Merge pull request #17052 from dzafman/wip-pidfile
...
tests: Increase sleep in test_pidfile.sh
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-08-18 15:44:41 -07:00
Jason Dillaman
9d7ff92b9a
Merge pull request #15691 from vshankar/mirror-ha-policy
...
rbd-mirror: introduce basic image mapping policy
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-08-18 15:13:59 -04:00
David Zafman
599d7622dd
tests: run-standalone.sh skip core_pattern if already set
...
If sudo requires a password it is nice to be able to avoid
sudo sysctl by setting core_pattern ahead of time.
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-08-18 10:27:12 -07:00
Alfredo Deza
3ca95b6094
Merge pull request #17076 from ceph/toc-sidebar-fix
...
doc/templates update toctree call to include hidden entries
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2017-08-18 12:29:05 -04:00
Alfredo Deza
1e8e689ca7
Merge pull request #17093 from dzafman/wip-runs-message
...
tests: run-standalone.sh improve error message
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-08-18 12:08:17 -04:00
Alfredo Deza
9bb3397a58
doc update template call for toctree
...
Up until version 1.1.3 of Sphinx, this call would show hidden toctree
entries. Most of Ceph's toctree's are hidden, so when the version of
Sphinx was bumped to >1.6, the sidebar stopped showing entries
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-18 12:05:03 -04:00
Kefu Chai
fbfd17b2fd
Merge pull request #17026 from dzafman/wip-add-trap
...
tests: qa/standalone: Add trap for signals to restore the kernel core pattern
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-18 23:02:04 +08:00
lisali
1b90d57764
os/bluestore: Add lat record of deferred_queued and deferred_aio_wait
...
Originally bluestore defines the two lat deferred_queued_lat and
deferred_aio_wait_lat, but doesn't use it.
This patch is to add the records that each TXC stays on deferred queue
deferred ios.
Signed-off-by: Xiaoyan Li xiaoyan.li@intel.com
2017-08-18 09:51:35 -04:00
Venky Shankar
8647b37cbf
rbd-mirror: load/update image map state machine
...
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2017-08-18 08:49:04 -04:00
Venky Shankar
64fa2c12c7
rbd-mirror: track on-disk image to instance map
...
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2017-08-18 08:49:04 -04:00
David Zafman
175b10795d
tests: run-standalone.sh improve error message
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-08-18 03:49:42 -07:00
Ziye Yang
35e7955f80
NVMEDevice: fix the write bug
...
This patch can solve the write issue when we use spdk nvme driver
to handle I/Os from db bdev in the future.
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
2017-08-18 18:16:07 +08:00
Boris Ranto
32f28c96d0
Merge pull request #17070 from ktdreyer/rpm-macros-in-comments
...
rpm: rm macros in comments
Reviewed-By: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2017-08-18 11:33:45 +02:00
xie xingguo
6ae96d33a8
mon/PGMap: reweight::by_utilization - skip DNE osds
...
EC could set one or more members of acting set to CRUSH_ITEM_NONE,
which as a result can cause pgs_by_osd.resize() attempt to apply
for a large amount of memory which we can not afford.
Fix the above problem by always excluding a current DNE osd from
acting set.
Fixes: http://tracker.ceph.com/issues/20970
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-18 13:27:06 +08:00
Kefu Chai
8afca6dfa8
Merge pull request #17043 from renhwztetecs/renhw-wip-pgmap-pool
...
mon/pgmap: update pool nearfull display
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-18 11:32:41 +08:00
Kefu Chai
fd07d7bb5e
Merge pull request #17002 from mychoxin/yuanxin_adjust_blockdevice
...
os/bluestore: move aio_callback{,_priv} to base class BlockDevice
Reviewed-by: Pan Liu <liupan1111@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-18 11:22:14 +08:00
Kefu Chai
405c73e59d
Merge pull request #16940 from jcsp/wip-20955
...
mgr: add missing call to pick_addresses
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-18 11:14:37 +08:00
David Zafman
021177b790
Merge pull request #16407 from dzafman/wip-20243
...
osd: Improve size scrub error handling and ignore system attrs in xattr checking
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-17 20:05:40 -07:00
songweibin
19dd4203eb
common: add new line break when get command descriptions
...
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2017-08-18 08:54:07 +08:00
songweibin
992829d38c
rbd: adding newline operation when only '--format' used
...
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2017-08-18 08:54:07 +08:00
Jason Dillaman
5d3d5ea5ac
test/librbd: TestMirroringWatcher unit tests should ignore duplicates
...
Fixes: http://tracker.ceph.com/issues/21029
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-08-17 18:39:05 -04:00