Yuri Weinstein
8f2f0f0fc0
Merge pull request #17934 from joke-lee/rgw_list_objecst_wrong_result_with_marker_when_enable_versioning
...
rgw:fix list objects with marker wrong result when bucket is enable versioning
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
2017-10-20 13:46:09 -07:00
Ali Maredia
2e477f3c05
Merge pull request #17673 from mogeb/blkin
...
blkin: link against lttng-ust-fork
2017-10-20 15:52:55 -04:00
Kefu Chai
9970342d58
Merge pull request #18414 from majianpeng/pmem-work
...
libmpem: Revert "submodule: make libmpem as a submodule."
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-21 02:58:01 +08:00
Casey Bodley
1a2db61de2
Merge pull request #18335 from linuxbox2/wip-rgw-readdir2
...
rgw_file: implement variant offset readdir processing
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-10-20 11:55:17 -04:00
Kefu Chai
38e789dc3b
Merge pull request #18392 from tchaikov/wip-21842
...
os/bluestore: implement BlueRocksEnv::AreFilesSame()
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-10-20 21:37:44 +08:00
John Spray
8c45855325
Merge pull request #18251 from jan--f/mgr-py-module-constants
...
pybind/mgr_module: move PRIO_* and PERFCOUNTER_* to MgrModule class
Reviewed-by: John Spray <john.spray@redhat.com>
2017-10-20 12:58:22 +01:00
John Spray
bd8814bf58
Merge pull request #18021 from jcsp/wip-prometheus-disk-occupation
...
mgr/prometheus: add ceph_disk_occupation series
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
2017-10-20 12:28:12 +01:00
Jianpeng Ma
73fb6eef73
Revert "submodule: make libmpem as a submodule."
...
This reverts commit 6a14159ee4
.
Using ExternalProject_Add::GIT to download nvml source .
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-10-20 17:55:48 +08:00
Mykola Golub
8eeae328cb
Merge pull request #18250 from dillaman/wip-21763
...
doc/rbd: tweaks for the LIO iSCSI gateway
Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
2017-10-20 11:55:44 +03:00
Kefu Chai
5d31a5aee4
os/bluestore: implement BlueRocksEnv::AreFilesSame()
...
it is used by the "repair" feature to dedup the files to be searched for
MANIFEST-* files. the default implementation is the POSIX one, which
tries to look at the local fs, but we should be looking for the files in
the bluefs. in this very use case, wal and db do not share the same device,
so we can just compare the paths. actually, it should aways return
"false". as the files being compared are always "db" and "db.wal".
Fixes: http://tracker.ceph.com/issues/21842
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-20 12:25:14 +08:00
Kefu Chai
d7244dc030
Merge pull request #18387 from tchaikov/wip-dmclock-client-info-ptr
...
osd,dmclock: use pointer to ClientInfo instead of a copy of it
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
2017-10-20 11:47:59 +08:00
Kefu Chai
e956c9a195
Merge pull request #18350 from ovh/bp-ceph-conf-dump-all
...
tools/ceph-conf: dump parsed config in plain text or as json
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-20 11:46:26 +08:00
Kefu Chai
7425a8830c
Merge pull request #18367 from zealoussnow/wip-10180
...
ceph-bluestore-tool: create out_dir before create full path of kvdb
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-10-20 11:45:38 +08:00
Kefu Chai
74f147b849
Merge pull request #17441 from yanyixing/update-umcloud-affiliation
...
mailmap: Update umcloud affiliation
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-20 09:58:49 +08:00
Josh Durgin
34951266fe
Merge pull request #18374 from tchaikov/wip-ceph-C-d
...
ceph.in: do not panic at control+d in interactive mode
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
2017-10-19 11:52:13 -07:00
Kefu Chai
cc09e30d42
Merge pull request #17462 from majianpeng/pmem-work
...
cmake: compile nvml as an external project
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-19 23:38:10 +08:00
Jianpeng Ma
b4cc9a9aa8
cmake: Build libpmem from source code.
...
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-10-20 00:44:09 +08:00
Jason Dillaman
4f227e108d
doc/rbd: tweaks for the LIO iSCSI gateway
...
Fixes: http://tracker.ceph.com/issues/21763
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-10-19 09:40:22 -04:00
Xie Xingguo
3e38616297
Merge pull request #18389 from yaozongyou/fix-type-in-bluestore-migration
...
doc: fix typo in bluestore-migration.rst
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-10-19 18:36:25 +08:00
Jos Collin
33d99b91c1
Merge pull request #18395 from gaosibei/mailmap
...
mailmap: Add Sibei, XueYu Affiliation
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-10-19 10:21:40 +00:00
gaosibei
d6c3e8676b
mailmap, organizationmap: add Sibei, XueYu
...
Signed-off-by: Sibei Gao <gaosb@inspur.com>
2017-10-19 17:02:52 +08:00
Kefu Chai
22aff9e87e
osd: update mClock.*Queue to incorporate the changes on dmclock
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-19 15:39:46 +08:00
Yao Zongyou
ae660d902b
doc: fix typo in bluestore-migration.rst
...
Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
2017-10-19 14:38:40 +08:00
Kefu Chai
a79af0c256
Merge pull request #18232 from jdurgin/wip-filestore-rocksdb
...
common/options: enable multiple rocksdb compaction threads for filestore
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-19 13:55:14 +08:00
Kefu Chai
297efaa81f
Merge pull request #18311 from shinobu-x/sk-osd_20171015
...
osd: Don't initialze pointers by NULL or 0
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-10-19 13:54:31 +08:00
Kefu Chai
0d32658ecf
Merge pull request #14213 from xiaoxichen/fix_wbthrottle_assert
...
os/Filestore: fix wbthrottle assert.
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-19 13:53:15 +08:00
Kefu Chai
21cf1eb4fd
Merge pull request #18256 from liewegas/wip-bluestore-superblock
...
os/bluestore: allow reconstruction of osd data dir from bluestore bdev label
Reviewed-By: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-19 13:51:18 +08:00
Kefu Chai
54dab66341
Merge pull request #18346 from tchaikov/wip-log-if-do_read_entry-fails
...
os/filestore: print out the error if do_read_entry() fails
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-10-19 13:41:18 +08:00
Kefu Chai
5e370e1299
dmclock: pickup latest dmclock subtree
...
to include the change of https://github.com/ceph/dmclock/pull/41
Merge commit '060a7777cb6fe3f052259e1324490cdbf7b49980'
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-19 13:20:29 +08:00
Kefu Chai
060a7777cb
Squashed 'src/dmclock/' changes from 93f760c57c..1bbd42b8fe
...
1bbd42b8fe
Merge pull request #41 from tchaikov/wip-client-info-ptr
cb7901e99a
ClientRec: instead of a copy of ClientInfo, keep a pointer of it
git-subtree-dir: src/dmclock
git-subtree-split: 1bbd42b8fe
2017-10-19 13:19:16 +08:00
Leo Zhang
bd018bf48b
ceph-bluestore-tool: create out_dir before create full path of kvdb
...
Signed-off-by: Leo Zhang <nguzcf@gmail.com>
2017-10-19 11:58:46 +08:00
Josh Durgin
a5e917fb9b
Merge pull request #18145 from dzafman/wip-18162
...
osd: object added to missing set for backfill, but is not in recovering, error!
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-10-18 17:33:12 -07:00
Matt Benjamin
3d88b2cd12
Merge pull request #18377 from joscollin/wip-cleanup-rgw-function-names
...
rgw: Fix getter function names in RGWEnv
2017-10-18 16:52:37 -04:00
Matt Benjamin
5e0bea71b5
rgw_file: disable FLAG_EXACT_MATCH enforcement
...
a. upstream motivating behavior no longer reproduces
b. incorrect stat behavior observed, traced to exact match enforcement
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2017-10-18 16:29:19 -04:00
Matt Benjamin
a2c34c5973
rgw_file: implement variant offset readdir processing
...
Introduce new rgw_readdir2(...), which in which continues
from an arbitrary dirent name, which presumably has been
seen in a prior partial enumeration.
Add single-file unit test for READDIR cases, librgw_file_marker.cc.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2017-10-18 16:23:51 -04:00
vasukulkarni
3172a63c64
Merge pull request #18380 from zmc/wip-master-init
...
Changes required for teuthology's systemd support
2017-10-18 13:00:07 -07:00
Matt Benjamin
cea38c72d2
Merge pull request #18365 from linuxbox2/wip-rgw-v3open-write
...
rgw_file: explicit NFSv3 open() emulation
2017-10-18 15:31:13 -04:00
Zack Cerza
f9acdc774d
qa/tasks/ceph: Set owner on mds mount point
...
Signed-off-by: Zack Cerza <zack@redhat.com>
2017-10-18 12:59:09 -06:00
Zack Cerza
e606386626
qa/tasks/cephfs/filesystem: Check for mds failure
...
... inside Filesystem.are_daemons_healthy()
Signed-off-by: Zack Cerza <zack@redhat.com>
2017-10-18 12:59:09 -06:00
Zack Cerza
4516ebb6c0
qa/tasks/ceph: Remove /var/lib/ceph copypasta
...
Signed-off-by: Zack Cerza <zack@redhat.com>
2017-10-18 12:59:09 -06:00
Zack Cerza
a653720f50
qa/tasks/ceph: Set owner on osd mount point
...
This is needed when running with systemd
Signed-off-by: Zack Cerza <zack@redhat.com>
2017-10-18 12:59:09 -06:00
Zack Cerza
16dcceae5c
qa/tasks/ceph: Set owner on mon mount point
...
This is needed when running with systemd
Signed-off-by: Zack Cerza <zack@redhat.com>
2017-10-18 12:59:09 -06:00
Casey Bodley
8c68b30905
Merge pull request #15554 from cbodley/wip-rgw-parse-cr-dump
...
tools/rgw: add script to inspect admin socket "cr dump"
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2017-10-18 14:32:22 -04:00
David Zafman
69b5fc54fe
test: Cleanup test-erasure-eio.sh code
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-10-18 11:12:14 -07:00
David Zafman
c2572bee3c
test: Add replicated recovery/backfill test
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-10-18 11:12:14 -07:00
David Zafman
689bff354a
osd: Better recovery/backfill restart for mark_unfound_lost delete/revert
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-10-18 11:12:07 -07:00
David Zafman
7f8b0ce9e6
osd, mon: Add new pg states recovery_unfound and backfill_unfound
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-10-18 11:02:10 -07:00
David Zafman
bb2bcb95f5
osd: Add new UnfoundBackfill and UnfoundRecovery pg transitions
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-10-18 11:01:39 -07:00
David Zafman
b9de5eec26
test: Test case that reproduces tracker 18162
...
recover_replicas: object added to missing set for backfill, but is not in recovering, error!
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-10-18 10:58:23 -07:00
Yuri Weinstein
aa1d93fdb5
Merge pull request #18378 from ceph/wip-yuriw-21822-master
...
tests - ceph-ansible vars additions
Reviewed-by: Vasu Kulkarni <vasu@redhat.com>
2017-10-18 10:19:35 -07:00