Commit Graph

82667 Commits

Author SHA1 Message Date
Alfredo Deza
22780c7aa8
Merge pull request #20203 from ceph/wip-rm22642
ceph-volume: fix usage of the --osd-id flag

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2018-02-01 11:13:21 -05:00
Sage Weil
fbc4192357
Merge pull request #20090 from liewegas/wip-bluestore-label
os/bluestore: make bdev label parsing error more meaningful and less noisy

Reviewed-by: Varada Kari <varada.kari@gmail.com>
2018-02-01 08:51:01 -06:00
Mykola Golub
69e479bd46
Merge pull request #20214 from dillaman/wip-22819
librbd: potential crash if object map check encounters error

Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-02-01 12:01:00 +02:00
Kefu Chai
b890201fa6
Merge pull request #20175 from tone-zhang/wip-fix-bug22828
cmake: fix libcephfs-test.jar build failure

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-01 12:46:35 +08:00
Kefu Chai
6062fe0a41
Merge pull request #20174 from cbodley/wip-log-stream-clear
log: clear thread-local stream's ios flags on reuse

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-01 12:45:54 +08:00
Kefu Chai
87aad2d241
Merge pull request #20166 from smithfarm/wip-fix-python2-global
build/ops: rpm: fix _defined_if_python2_absent conditional

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-01 12:43:35 +08:00
Kefu Chai
2bdb833b36
Merge pull request #20183 from tchaikov/wip-crushtool
crushtool: add --add-bucket and --move options

Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-01 12:37:55 +08:00
Kefu Chai
2769583ff1
Merge pull request #20180 from xiexingguo/wip-more-balancer-fixes
mgr/balancer: two more fixes

Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-01 12:34:50 +08:00
Kefu Chai
8c7dd252cc
Merge pull request #20154 from xiexingguo/wip-mgr-balancer-fixes
mgr/balancer: pool-specific optimization support and bug fixes

Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-01 12:33:31 +08:00
Kefu Chai
129effb0bf
Merge pull request #20128 from guzhongyan/master
common/pick_address: wrong prefix_len in pick_iface()

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-01 12:29:19 +08:00
Kefu Chai
1c320ea717
Merge pull request #20080 from dillaman/wip-librados-client-compat
librados: getter for min compatible client versions

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2018-02-01 12:24:54 +08:00
Andrew Schoen
8d38932c21 ceph-volume: adds tests for zap --destroy and --osd-id
These are not added for dmcrypt right now because there is a bug related
to zapping encrypted disks that needs fixed first.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2018-01-31 16:48:22 -06:00
Jason Dillaman
c8d3254609 librbd: potential crash if object map check encounters error
Fixes: http://tracker.ceph.com/issues/22819
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-01-31 16:52:52 -05:00
Casey Bodley
9401bba7a8
Merge pull request #20195 from luomuyao/bugfix
rgw: drop a repeated statement for encode_xml()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-01-31 10:54:15 -05:00
Andrew Schoen
f88f2d3bc1 ceph-volume: no need to return osd_id from util.prepare.check_id
Now that osd_id is passed to util.prepare.create_id it doesn't
make any sense to return osd_id from check_id anymore as it's
not being used.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2018-01-31 09:04:09 -06:00
luomuyao
341ddddf24 rgw: drop a repeated statement for encode_xml()
Signed-off-by: luomuyao <luo.muyao@zte.com.cn>
2018-01-31 10:33:27 +08:00
Patrick Donnelly
d8ba4862c1
Merge PR #19760 into master
* refs/pull/19760/head:
	mds: add dump flag for CInode
	mds: add command "openfiles ls"

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-01-30 15:18:10 -08:00
Patrick Donnelly
90687e499c
Merge PR #19825 into master
* refs/pull/19825/head:
	client: properly choose target mds for rmsnap/renamesnap
	mds: properly setup need_snapflush for snapped inode
	mds: ignore MClientCaps::FLAG_NO_CAPSNAP

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-01-30 15:18:01 -08:00
Patrick Donnelly
6c6e25f8ee
Merge PR #19833 into master
* refs/pull/19833/head:
	common: add C_SaferCond ctor with name argument
	Client: use C_SaferCond for "_flush_range"
	client: use C_SaferCond for _fallocate and ll_write_block
	client: use C_SaferCond for _sync_fs and _fsync
	client: use C_SaferCond in Client::_write
	client: use C_SaferCond for _read_sync
	client: use C_SaferCond in _read_async
	client: use C_SaferCond for "Client::_read"

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-01-30 15:17:54 -08:00
Patrick Donnelly
bb329c5582
Merge PR #19836 into master
* refs/pull/19836/head:
	Avoid the assert failure when the inode for the cap_export from other MDS happened not in MDCache

Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-01-30 15:17:48 -08:00
Patrick Donnelly
89dfc9521d
Merge PR #19842 into master
* refs/pull/19842/head:
	client: unify function name in debug log for Client.cc

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-01-30 15:17:42 -08:00
Patrick Donnelly
b233abc211
Merge PR #19991 into master
* refs/pull/19991/head:
	cephfs-journal-tool: move shutdown to the deconstructor of MDSUtility

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-01-30 15:17:35 -08:00
Patrick Donnelly
388c9dd37c
Merge PR #20001 into master
* refs/pull/20001/head:
	mds: use the steady clock on tick

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-01-30 15:17:29 -08:00
Patrick Donnelly
23ff594e16
Merge PR #20012 into master
* refs/pull/20012/head:
	mds: fix scrub crash

Reviewed-by: Douglas Fuller <dfuller@redhat.com>
2018-01-30 15:17:22 -08:00
Patrick Donnelly
69765dcbcb
Merge PR #20079 into master
* refs/pull/20079/head:
	mds: set higher priority for some perf counters

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-01-30 15:17:16 -08:00
Patrick Donnelly
ae0b89c6c9
Merge PR #20113 into master
* refs/pull/20113/head:
	osdc/ObjectCacher: don't merge TX buffer heads
	osdc/ObjectCacher: fix off-by-one error in bh_write_commit()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-01-30 15:17:10 -08:00
Andrew Schoen
43f699fcbc ceph-volume: when reusing an osd ID you must give that id to 'osd new'
If you do not then auth will not be created for the new OSD and the
daemon will not be able to start.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2018-01-30 16:28:17 -06:00
Andrew Schoen
7c809166ae ceph-volume: prepare_* methods do not need to recreate fsid or osd_id
The prepare_filestore and prepare_bluestore methods do not need to
attempt to recreate osd_id or fsid because this happens in prepare
already.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2018-01-30 11:39:05 -06:00
Andrew Schoen
a08fc63961 ceph_volume: modify util.prepare.check_id to handle stdout as a list
process.call returns stdout as a list, not a string

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2018-01-30 11:32:53 -06:00
Casey Bodley
9cdd2fe658
Merge pull request #20000 from zhouyuan/rgw_beast_listen
rgw: allow beast frontend to listen on specific IP address

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-01-30 12:04:47 -05:00
Casey Bodley
50917930b9
Merge pull request #20058 from cbodley/wip-doc-rgw-frontends
doc/rgw: add page for http frontend configuration

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
2018-01-30 11:38:06 -05:00
Patrick Donnelly
0d6c5927ba
Merge PR #20165 into master
* refs/pull/20165/head:
	doc/client: uniform naming

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-01-30 08:35:58 -08:00
Casey Bodley
8ccefcbacd
Merge pull request #20164 from luomuyao/typo
rgw: fix a typo in comment

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
2018-01-30 11:29:45 -05:00
Andrew Schoen
0d27fff319 ceph-volume: tests for util.prepare.check_id
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2018-01-30 09:22:58 -06:00
Andrew Schoen
699aa65878 ceph-volume: return osd_id from util.prepare.check_id if it exists
This also changes this so the osd_id is returned as a string so
an ID of 0 would evaluate to True.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2018-01-30 09:21:47 -06:00
Casey Bodley
95ad024c3c log: clear thread-local stream's ios flags on reuse
when reusing a thread-local std::ostream for a new log entry, clear any
ios flags (ie eofbit/failbit/badbit) that may have been set during its
previous use

without this, any stream errors (for example, passing a nullptr to
operator<< sets the badbit) will result in all log output on that thread
to be blank for the remainder of the process

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2018-01-30 09:28:01 -05:00
Kefu Chai
8ea03a78d5 test/cli/crushtool: add test for --add-bucket and --move
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-01-30 22:09:59 +08:00
Kefu Chai
c1f4334345 crush/CrushWrapper: lower log level of check_item_loc()
it's not an error if the item is not at loc.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-01-30 22:09:58 +08:00
Kefu Chai
22c943511e crushtool: add --move
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-01-30 22:09:58 +08:00
Jason Dillaman
5b95c51a75
Merge pull request #20159 from shun-s/fix-rbd-log
librbd: clean up ManagedLock log prefix

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-01-30 08:10:41 -05:00
Kefu Chai
4525003908 crushtool: add --add-bucket
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-01-30 19:09:09 +08:00
Gu Zhongyan
b0d8043a72 common/pick_address: wrong prefix_len in pick_iface()
With prefix_len initialized as zero, mask in netmask_ipv4/6()
will always be zero, so find_ip_in_subnet() always return the
first interface.
Set prefix_len to the right value to fetch the right interface.

Signed-off-by: Gu Zhongyan guzhongyan@360.cn
Signed-off-by: yupeng chen chenyupeng-it@360.cn
2018-01-30 18:37:34 +08:00
xie xingguo
cdae240ed9 pybind/mgr/balancer: fix sanity check against minimal pg numbers per pool
And rename some variables properly.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-01-30 17:02:41 +08:00
xie xingguo
ae56d847a0 pybind/mgr/balancer: do not dirty compat_ws on error out
We will get a worse result if we execute the corresponding plan later.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-01-30 17:02:35 +08:00
Yan, Zheng
4eb4827f60 client: properly choose target mds for rmsnap/renamesnap
Old code does not set inode or dentry for rmsnap/renamesnap requests.
So rmsnap/renamesnap requests are sent to random mds.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
2018-01-30 16:26:28 +08:00
Yan, Zheng
de3f3d88b3 mds: properly setup need_snapflush for snapped inode
MDCache::cow_inode() checks "cap->issued() & CEPH_CAP_ANY_WR" to decide
if it needs to setup need_snapflush for the new snapped inode.
Locker::handle_client_caps() should call Locker::_do_cap_update() first,
then update issued caps. Otherwise MDCache::cow_inode() will fail to
setup need_snapflush if cap messages flushes dirty caps and releases the
same caps.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
2018-01-30 16:25:11 +08:00
Kefu Chai
8d5da83ba0
Merge pull request #19770 from shinobu-x/mempool_lock
common: s/unique_lock/lock_guard/, if manual lock/unlock are not necessary

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-01-30 10:08:48 +08:00
Tone Zhang
108ac2ca1c cmake: fix libcephfs-test.jar build failure
When building Ceph Debian installation package, libcephfs-test.jar
build would fail if multi junit versions are installed on the host.

In src/java/CMakeLists.txt, the "junit" search order is "junit"
and then "junit4". In case multi junit versions are installed,
the lower version (like 3.8) is found firstly, but junit4 is
required only. The search result will cause the failure.

Fix the issue by change search order to firstly search junit4
by default.

Fixes: http://tracker.ceph.com/issues/22828

Signed-off-by: Tone Zhang <tone.zhang@arm.com>
2018-01-30 02:07:12 +00:00
shun-s
c2e9595174 rbd: clean up ManagedLock log prefix
clean up ManagedLock log prefix

Signed-off-by: shun-s <song.shun3@zte.com.cn>
2018-01-30 09:41:07 +08:00
xie xingguo
52e336efc1 pybind/mgr/balancer: re-initialize everything on instantiating a new Eval
Otherwise there might be obsolete pool/root infos etc.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-01-30 08:37:16 +08:00