RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,763 Commits 216 Branches 395 Tags 1.4 GiB
d4254db9c9
Commit Graph

82763 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Casey Bodley
22df0fbffd rgw: civetweb accepts multiple port= entries 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2018-01-30 13:35:30 -05: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
cf1b84195e rgw: frontend config uses multimap 
this allows us to configure multiple values for a given key without
resorting to string formatting to cram them into a single key/value pair

ex. port=80 port=443s instead of port=80+443s

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2018-01-30 12:05:52 -05: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
Brad Hubbard
2aa5950caf c_read_operations.cc: Silence tautological-compare compiler warning 
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
 2018-01-30 12:29:29 +10: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
Casey Bodley
a6bf362d3c test/log: add failing unit test for reuse of bad stream 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2018-01-29 17:10:58 -05:00
Casey Bodley
cb396a78d4
Merge pull request #20052 from ceph/revert-19253-wip-rgw-22124 
Revert "rgw: reshard should not update stats when linking new bucket instance"

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2018-01-29 16:47:08 -05:00
Sage Weil
5c1a3c644a Revert "osd/ECBackend: fix on_write ordering w/ sync onreadable callbacks" 
This reverts commit 1908c06149.

Hoping this helps resolve the failed assertion

src/osd/ExtentCache.h: 371: FAILED assert(tid == 0)

Signed-off-by: Sage Weil <sage@redhat.com>
 2018-01-29 15:24:19 -06:00
Matt Benjamin
40c93224c0
Merge pull request #20171 from linuxbox2/rgw_rvrt_disable_exact 
Revert "rgw_file: disable FLAG_EXACT_MATCH enforcement"
 2018-01-29 13:06:59 -05:00
Andrew Schoen
548eadeec6 ceph-volume: check to see if an OSD id exists before reusing it 
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
 2018-01-29 10:48:09 -06:00
Andrew Schoen
4ac99de6d9 ceph-volume: adds a prepare util for checking OSD ID existance 
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
 2018-01-29 10:43:04 -06:00
Matt Benjamin
cbe3d3f41b Revert "rgw_file: disable FLAG_EXACT_MATCH enforcement" 
This reverts commit 5e0bea71b5.
Fixes: http://tracker.ceph.com/issues/22827

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2018-01-29 11:21:39 -05:00
Sage Weil
a78cdceeec os/bluestore: disable on_applied sync_complete 
1. This is causing problems in ECBackend that are not obvious.
2. It didn't show any performance win anyway.
3. I'm trying to remove on_applied callbacks entirely.  If that works out
this will all be moot!

Fixes: http://tracker.ceph.com/issues/22668
Signed-off-by: Sage Weil <sage@redhat.com>
 2018-01-29 08:55:38 -06:00
Sage Weil
4f537e2263
Merge pull request #20167 from cernceph/dvanders_withhold 
osd: change log level when withholding pg creation

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-01-29 08:42:45 -06:00
Dan van der Ster
d12ba37e0d osd: change log level when withholding pg creation 
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
 2018-01-29 15:37:00 +01:00
Nathan Cutler
f57e00db80 build/ops: rpm: fix _defined_if_python2_absent conditional 
The expectation is that _defined_if_python2_absent will be defined
if (and only if) the python2 bcond is not set. Before this patch, if
somebody were to build the package on suse_version 1500 with
--with-python2, the _defined_if_python2_absent would be defined,
which is a bug.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2018-01-29 14:17:00 +01:00
luomuyao
dc2369d8af rgw: fix a typo in comment 
Signed-off-by: luomuyao <luo.muyao@zte.com.cn>
 2018-01-29 19:01:33 +08:00
John Spray
c41ef5a5ce
Merge pull request #19758 from nrdmn/fix-dashboard-wip 
pybind/mgr/dashboard: fix reverse proxy support

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
 2018-01-29 10:56:00 +00:00
Kefu Chai
91e126084b
Merge pull request #20142 from shangzhong/wip-java-native 
java/native: s/jni: lstat/jni: stat in native_ceph_stat

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-29 18:41:54 +08:00
Kefu Chai
e46a4d80cc
Merge pull request #20130 from k0ste/newfeature 
mgr: balancer: fixed mistype "AttributeError: 'Logger' object has no attribute 'err'"

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-29 18:38:05 +08:00
Kefu Chai
3e3e781600
Merge pull request #20127 from majianpeng/issue_op_cleanup 
osd/ReplicatedBackend: clean up code.

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-29 18:37:38 +08:00
Kefu Chai
d61b129e4e
Merge pull request #20119 from Liuchang0812/remove-health-service 
mon: remove health service

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-29 18:37:12 +08:00
Kefu Chai
9c45641540
Merge pull request #20092 from tangwenjun3/wip-fix-write-label 
os/bluestore: no need to fsync when failed to write label

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-01-29 18:36:43 +08:00