Kefu Chai
d254d07dba
Merge pull request #17639 from tchaikov/wip-doc-ceph-disk
...
doc: update ceph-disk with a state-transition diagram
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-09-12 12:42:14 +08:00
David Zafman
44f51024cc
Merge pull request #17538 from dzafman/wip-21272
...
Add export and remove ceph-objectstore-tool command option
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-11 20:12:27 -07:00
Sage Weil
c54602caa4
Merge pull request #17537 from mychoxin/yuanxin_remove_submit
...
os/bluestore: remove useless function submit
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-09-11 21:05:25 -05:00
Alfredo Deza
e5e50f75ce
Merge pull request #17606 from ceph/wip-bz1478598
...
ceph-volume allow filtering by `uuid`, do not require osd id
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2017-09-11 15:44:42 -04:00
Alfredo Deza
ecd5af88da
ceph-volume lvm.trigger just split the osd_id once
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-09-11 14:21:34 -04:00
Alfredo Deza
5392697121
ceph-volume tests catch improper parsing of osd uuid
...
When the osd ID existed in the UUID in the same format (e.g. '1-') the
parsing would break returning a bogus UUID that is impossible to find
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-09-11 14:21:33 -04:00
Andrew Schoen
f41d359eba
tests: remove 'ceph-' prefix from test node hostnames
...
This updates our Vagrantfile to match the changes in ceph-ansible
introduced by https://github.com/ceph/ceph-ansible/commit/298a63c43
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-09-11 14:21:33 -04:00
Alfredo Deza
b8613c1d7b
ceph-volume lvm.api PVolumes should filter by all matching tags, not just one
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-09-11 14:21:33 -04:00
Alfredo Deza
120fd6a196
ceph-volume tests pv API should also match all pv_tags
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-09-11 14:21:33 -04:00
Alfredo Deza
fe2a7106de
ceph-volume tests prove all volume tags have to match in vgs
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-09-11 14:21:33 -04:00
Casey Bodley
34a374048c
Merge pull request #17377 from cbodley/wip-rgw-test-multi-encryption
...
test/rgw: fix test_encrypted_object_sync for 3+ zones
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-09-11 13:42:00 -04:00
Sage Weil
3b4a9d04be
Merge pull request #17102 from mychoxin/yuanxin_print_log_if_add_event_fail
...
msg/async: print error log if add_event fail
Reviewed-by: Pan Liu <liupan1111@gmail.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-09-11 11:42:44 -05:00
Yuri Weinstein
cfb13b3b06
Merge pull request #16492 from yehudasa/wip-rgw-multi-log
...
rgw: multisite log tracing
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-09-11 08:31:04 -07:00
Yuri Weinstein
9addaba94e
Merge pull request #17400 from theanalyst/fix/rgw-set-attrs-mtime
...
rgw: rgw_rados: set_attrs now sets the same time for BI & object
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-09-11 08:28:46 -07:00
Jason Dillaman
b1644fd3fb
Merge pull request #17638 from idryomov/wip-rbd-already-mapped-fixes
...
krbd: rewrite "already mapped" code
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-09-11 10:58:05 -04:00
Alfredo Deza
6d679855aa
ceph-volume lvm.api all vg tags should match, not just one
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-09-11 09:08:46 -04:00
Alfredo Deza
80e401ca97
ceph-volume tests prove all tags have to match in lvs
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-09-11 09:08:46 -04:00
Alfredo Deza
dbaf30c3e4
ceph-volume lvm.api all lv tags should match, not just one
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-09-11 09:08:46 -04:00
Alfredo Deza
99a8a71969
ceph-volume lvm.activate allow not using osd_id
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-09-11 09:08:45 -04:00
Alfredo Deza
8d1a1a885f
ceph-volume tests prove missing args.osd_id is fine
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-09-11 09:08:45 -04:00
Alfredo Deza
d18d5e139b
ceph-volume tests add is_root and lv fixtures to conftest
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-09-11 09:08:45 -04:00
Kefu Chai
b35bf318af
doc: update ceph-disk with a state transition diagram
...
also, quote the variabls in source code with double quote.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-11 20:44:35 +08:00
Ilya Dryomov
cce269a82f
tests: update unmap.t for "already mapped" warning
...
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2017-09-11 14:18:38 +02:00
Mykola Golub
b196d38783
Merge pull request #17621 from idryomov/wip-krbd-xfstests-blockdev
...
qa/suites/krbd: enable xfstests blockdev tests
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-09-11 14:09:32 +03:00
Ilya Dryomov
69c6f139a7
krbd: rewrite "already mapped" code
...
The "already mapped" code, introduced in commit d6a66fc8f4
("rbd:
before rbd map, warn if the image is already mapped") is broken:
because of a use-after-free on attribute strings, the warning isn't
even printed half the time.
Rewrite making use of udev enumeration filters and fix the interface
while at it.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2017-09-11 11:34:25 +02:00
Sage Weil
2809fbf142
Merge pull request #17453 from kungf/eversion_t_opt_max
...
osd_types: define max in eversion_t::max() to static
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-10 14:21:39 -05:00
Sage Weil
14e783c0b9
Merge pull request #17571 from jcsp/wip-21260
...
mon: fix dropping mgr metadata for active mgr (#21260 )
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-10 14:20:30 -05:00
Sage Weil
bd2569b38c
Merge pull request #17572 from xiexingguo/wip-os-tool
...
tools/ceph_objectstore_tool: fix 'dup' unable to duplicate meta PG
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-10 14:18:37 -05:00
Sage Weil
745ed76164
Merge pull request #17585 from jdurgin/wip-recovery-delete-encoding-master
...
MOSDPGRecoveryDelete[Reply]: bump header version
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-10 14:18:13 -05:00
Sage Weil
5a3133bf18
Merge pull request #17588 from kungf/aio_submit_size_change
...
os/bluestore: shrink aio submit size to pending value
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-10 14:17:48 -05:00
Sage Weil
04c0044be0
Merge pull request #17599 from tchaikov/wip-encoding-optional
...
encoding: reset optional<> if it is uninitialized
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-10 14:17:32 -05:00
Sage Weil
fbeea651e3
Merge pull request #17600 from jecluis/wip-21309
...
mon/OSDMonitor: don't create pgs if pool was deleted
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-10 14:17:00 -05:00
Ilya Dryomov
9e9598dbf4
krbd: factor out enumerate_devices()
...
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2017-09-10 20:01:31 +02:00
Sage Weil
f34821c7bd
Merge pull request #17298 from xiexingguo/wip-pg-null-obc-access
...
osd/PrimaryLogPG: maybe_handle_manifest_detail - sanity check obc existence
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
2017-09-09 15:02:08 -05:00
Mykola Golub
0bafa7e8d4
Merge pull request #17559 from dillaman/wip-21181
...
qa/workunits/rbd: relax greps to support upgrade formatting change
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-09-09 11:23:57 +03:00
Kefu Chai
11d9b643ef
Merge pull request #17324 from smithfarm/wip-rbd-symlink
...
build/ops: rpm: drop legacy librbd.so.1 symlink in /usr/lib64/qemu
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Ademar de Souza Reis Jr <areis@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2017-09-09 12:12:08 +08:00
Kefu Chai
d40250d31e
Merge pull request #17512 from tchaikov/wip-chmod-x
...
common,mon,osd,pybind: silence warning and remove executable mode bit
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
2017-09-09 12:09:59 +08:00
Kefu Chai
de77a93765
Merge pull request #17539 from tchaikov/wip-21204
...
mon,option: set default value for mon_dns_srv_name
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-09 12:08:18 +08:00
Kefu Chai
050a9a516e
Merge pull request #17549 from iliul/fix-texttable-align
...
tools: Modify "rados df" header's alignment
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-09 12:07:38 +08:00
David Zafman
3bb20f6d75
ceph-objectstore-tool: Make pg removal require --force
...
Add new export-remove to combine the 2 operations
Fixes: http://tracker.ceph.com/issues/21272
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-09-08 17:56:05 -07:00
David Zafman
49ca1fff7f
ceph-objectstore-tool: Better messages for bad --journal-path
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-09-08 17:50:46 -07:00
David Zafman
3ac219df2d
test: Fix ceph-objectstore-tool test for standalone and latest code
...
vstart.sh now defaults to bluestore, so specify filestore
Set environment for run-standalone.sh and cmake build
Create td/cot_dir as test directory
Crush output format change
Change dir into test directory
Give a little time after pool creation
Check for core files as ceph-helpers.sh does
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-09-08 16:53:53 -07:00
David Zafman
495c32fd31
test: Move ceph-objectstore-tool test to standalone
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-09-08 16:53:30 -07:00
Tamilarasi Muthamizhan
ec423100dc
Merge pull request #17096 from ceph/wip-ansbile-fixes
...
[qa/tests]: misc ceph-ansible fixes and udpate
2017-09-08 14:47:12 -07:00
Yuri Weinstein
0c2a139ee6
Merge pull request #17513 from Liuchang0812/wip-max-avail-in-df
...
mon: incorrect MAX AVAIL in "ceph df"
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-08 13:41:07 -07:00
Patrick Donnelly
1b7aae6cdc
Merge PR #17533 into master
...
* refs/remotes/upstream/pull/17533/head:
qa: log ceph-fuse kill/cleanup
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-08 11:23:23 -07:00
Patrick Donnelly
6019a57fa3
Merge PR #17506 into master
...
* refs/remotes/upstream/pull/17506/head:
mds: reset Formatter on error
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-08 11:23:21 -07:00
Patrick Donnelly
52c79aecdd
Merge PR #17466 into master
...
* refs/remotes/upstream/pull/17466/head:
qa: whitelist expected MDS_READ_ONLY for kcephfs test
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-08 11:23:19 -07:00
Patrick Donnelly
5f99d9d53c
Merge PR #17456 into master
...
* refs/remotes/upstream/pull/17456/head:
mds: print subtrees only after merge
Reviewed-by: Zheng Yan <zyan@redhat.com>
2017-09-08 11:23:17 -07:00
Patrick Donnelly
490bc0050c
Merge PR #17452 into master
...
* refs/remotes/upstream/pull/17452/head:
Make standby-replay mds not migrate empty subtree when trimming cache
Make standby-replay mds avoid initiating subtree export
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
2017-09-08 11:23:15 -07:00