]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agomds: clean up log's function name for CDentry.cc
dongdong tao [Sat, 30 Dec 2017 13:01:47 +0000 (21:01 +0800)]
mds: clean up log's function name for CDentry.cc

Signed-off-by: dongdong tao <tdd21151186@gmail.com>
7 years agomds: clean up log's function name for CInode.cc
dongdong tao [Sat, 30 Dec 2017 12:23:26 +0000 (20:23 +0800)]
mds: clean up log's function name for CInode.cc

Signed-off-by: dongdong tao <tdd21151186@gmail.com>
7 years agoMerge pull request #19608 from luomuyao/dev
Jos Collin [Wed, 20 Dec 2017 05:01:16 +0000 (05:01 +0000)]
Merge pull request #19608 from luomuyao/dev

rgw: fix a typo in comment

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agocleanup: rgw: fix a typo in comment 19608/head
luomuyao [Wed, 20 Dec 2017 01:43:08 +0000 (09:43 +0800)]
cleanup: rgw: fix a typo in comment

Signed-off-by: luomuyao <luo.muyao@zte.com.cn>
7 years agoMerge PR #19424 into master
Patrick Donnelly [Wed, 20 Dec 2017 01:08:09 +0000 (17:08 -0800)]
Merge PR #19424 into master

* refs/pull/19424/head:
osdc/Journaler: introduce STATE_STOPPING state
osdc/Journaler: add 'stopping' check to various finish callbacks

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #18898 from Leeshine/wip-rgw-bug-22080
Casey Bodley [Tue, 19 Dec 2017 22:26:18 +0000 (17:26 -0500)]
Merge pull request #18898 from Leeshine/wip-rgw-bug-22080

rgw: create sync-module instance when execute radosgw-admin data sync run

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agoMerge pull request #19456 from liewegas/wip-22373
Sage Weil [Tue, 19 Dec 2017 17:55:07 +0000 (11:55 -0600)]
Merge pull request #19456 from liewegas/wip-22373

qa/standalone/ceph-helpers: pass --verbose to ceph-disk

7 years agoMerge pull request #19584 from qrGitHub/wip-rgw-unused-variable2
Casey Bodley [Tue, 19 Dec 2017 17:35:52 +0000 (12:35 -0500)]
Merge pull request #19584 from qrGitHub/wip-rgw-unused-variable2

rgw: drop variable bl in rgw_op.cc

Reviewed-by: Amit Kumar <amitkuma@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #17967 from tone-zhang/bug_21554
Yuri Weinstein [Tue, 19 Dec 2017 17:34:17 +0000 (09:34 -0800)]
Merge pull request #17967 from tone-zhang/bug_21554

rgw: add "Accept-Ranges" to response header of Swift API

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
7 years agoMerge pull request #19274 from badone/wip-rgw_sync_log_trim-uninit-errors
Yuri Weinstein [Tue, 19 Dec 2017 17:33:12 +0000 (09:33 -0800)]
Merge pull request #19274 from badone/wip-rgw_sync_log_trim-uninit-errors

rgw: Silence maybe-uninitialized false positives

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19310 from qrGitHub/wip-rgw-auth-retVal
Yuri Weinstein [Tue, 19 Dec 2017 17:32:53 +0000 (09:32 -0800)]
Merge pull request #19310 from qrGitHub/wip-rgw-auth-retVal

rgw: fix return value of auth v2/v4

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoMerge pull request #19401 from yaozongyou/rgw-admin-improve-bucket-stats
Yuri Weinstein [Tue, 19 Dec 2017 17:32:34 +0000 (09:32 -0800)]
Merge pull request #19401 from yaozongyou/rgw-admin-improve-bucket-stats

rgw-admin: properly filtering bucket stats by user_id or bucket_name

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19474 from qrGitHub/wip-rgw-redundant-S3AnonymousEngine
Yuri Weinstein [Tue, 19 Dec 2017 17:31:48 +0000 (09:31 -0800)]
Merge pull request #19474 from qrGitHub/wip-rgw-redundant-S3AnonymousEngine

rgw: remove redundant S3AnonymousEngine

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoMerge pull request #19511 from qrGitHub/wip-rgw-optimize-timeSkewCheck
Yuri Weinstein [Tue, 19 Dec 2017 17:31:28 +0000 (09:31 -0800)]
Merge pull request #19511 from qrGitHub/wip-rgw-optimize-timeSkewCheck

rgw: optimize time skew check

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoMerge pull request #19576 from qrGitHub/wip-rgw-log-adjustment
Casey Bodley [Tue, 19 Dec 2017 15:41:53 +0000 (10:41 -0500)]
Merge pull request #19576 from qrGitHub/wip-rgw-log-adjustment

rgw: adjust log format for lifecycle

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
7 years agoMerge pull request #19043 from liewegas/wip-22161
Sage Weil [Tue, 19 Dec 2017 15:33:30 +0000 (09:33 -0600)]
Merge pull request #19043 from liewegas/wip-22161

os/bluestore: prevent mount if osd_max_object_size >= 4G

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19273 from qrGitHub/wip-rgw-typo-UNKNOWN
Casey Bodley [Tue, 19 Dec 2017 15:16:34 +0000 (10:16 -0500)]
Merge pull request #19273 from qrGitHub/wip-rgw-typo-UNKNOWN

rgw: correct typo UNKOWN to UNKNOWN

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18196 from liewegas/wip-bluestore-sync-onreadable
Sage Weil [Tue, 19 Dec 2017 14:22:53 +0000 (08:22 -0600)]
Merge pull request #18196 from liewegas/wip-bluestore-sync-onreadable

os/bluestore: synchronous on_applied completions

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #19578 from cernceph/dvanders_brm
John Spray [Tue, 19 Dec 2017 11:40:33 +0000 (11:40 +0000)]
Merge pull request #19578 from cernceph/dvanders_brm

mgr/balancer: fix KeyError in balancer rm

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #19586 from liewegas/wip-22231
Haomai Wang [Tue, 19 Dec 2017 03:55:32 +0000 (11:55 +0800)]
Merge pull request #19586 from liewegas/wip-22231

Revert "msg/async/AsyncConnection: unregister connection when racing happened"

7 years agoRevert "msg/async/AsyncConnection: unregister connection when racing happened" 19586/head
Sage Weil [Tue, 19 Dec 2017 03:40:06 +0000 (21:40 -0600)]
Revert "msg/async/AsyncConnection: unregister connection when racing happened"

This reverts commit 5216309c25522e9e4a3c3a03ceb927079de91e9b.  Seeing many
many instances of

     0> 2017-12-19 00:04:34.146 7fed2ebc1700 -1 /build/ceph-13.0.0-4128-gc27b472/src/msg/async/AsyncConnection.cc: In function 'void AsyncConnection::process()' thread 7fed2ebc1700 time 2017-12-19 00:04:34.147015
/build/ceph-13.0.0-4128-gc27b472/src/msg/async/AsyncConnection.cc: 726: FAILED assert(0 == "old msgs despite reconnect_seq feature")

 ceph version 13.0.0-4128-gc27b472 (c27b4726c18322825fbc2a58de2759766e332fa6) mimic (dev)
 1: (ceph::__ceph_assert_fail(char const*, char const*, int, char const*)+0x102) [0x55ce15c5bab2]
 2: (AsyncConnection::process()+0x25f6) [0x55ce15f347e6]
 3: (EventCenter::process_events(int, std::chrono::duration<unsigned long, std::ratio<1l, 1000000000l> >*)+0x6e8) [0x55ce15cf5988]
 4: (()+0xb7b965) [0x55ce15cf8965]
 5: (()+0xb8c80) [0x7fed30e02c80]
 6: (()+0x76ba) [0x7fed314f16ba]
 7: (clone()+0x6d) [0x7fed305683dd]

See http://tracker.ceph.com/issues/22231
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agorgw: create sync-module instance when execute radosgw-admin data sync run 18898/head
lvshanchun [Tue, 19 Dec 2017 02:53:06 +0000 (10:53 +0800)]
rgw: create sync-module instance when execute radosgw-admin data sync run

Signed-off-by: lvshanchun <lvshanchun@gmail.com>
7 years agorgw: remove unused variable bl in file rgw_op.cc 19584/head
Bingyin Zhang [Tue, 19 Dec 2017 01:37:05 +0000 (09:37 +0800)]
rgw: remove unused variable bl in file rgw_op.cc

Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>
7 years agoMerge pull request #19129 from qrGitHub/wip-rgw-unused-param
Casey Bodley [Mon, 18 Dec 2017 19:11:43 +0000 (14:11 -0500)]
Merge pull request #19129 from qrGitHub/wip-rgw-unused-param

rgw: remove unused param in get_bucket_instance_policy_from_attr

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18662 from ZVampirEM77/wip-em-rewriteobj
Yuri Weinstein [Mon, 18 Dec 2017 16:48:05 +0000 (08:48 -0800)]
Merge pull request #18662 from ZVampirEM77/wip-em-rewriteobj

rgw: fix rewrite a versioning object create a new object bug

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19131 from theanalyst/usage-trim
Yuri Weinstein [Mon, 18 Dec 2017 16:47:23 +0000 (08:47 -0800)]
Merge pull request #19131 from theanalyst/usage-trim

cls/rgw: trim all usage entries in cls_rgw

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19272 from cfanz/wip2-optimize-get_obj_vals
Yuri Weinstein [Mon, 18 Dec 2017 16:46:32 +0000 (08:46 -0800)]
Merge pull request #19272 from cfanz/wip2-optimize-get_obj_vals

cls_rgw: use more effective container operations in get_obj_vals

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #17482 from yaozongyou/rgw-admin-process-all-gc-objects
Yuri Weinstein [Mon, 18 Dec 2017 16:45:08 +0000 (08:45 -0800)]
Merge pull request #17482 from yaozongyou/rgw-admin-process-all-gc-objects

rgw-admin: support for processing all gc objects including unexpired.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoMerge PR #19234 into master
Patrick Donnelly [Mon, 18 Dec 2017 14:53:03 +0000 (06:53 -0800)]
Merge PR #19234 into master

* refs/pull/19234/head:
mds: handle client session messages when mds is stopping

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #19533 from batrick/vstart-runner-fixes
John Spray [Mon, 18 Dec 2017 13:18:12 +0000 (13:18 +0000)]
Merge pull request #19533 from batrick/vstart-runner-fixes

vstart_runner: fixes for recent cephfs changes

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agomgr/balancer: fix KeyError in balancer rm 19578/head
Dan van der Ster [Mon, 18 Dec 2017 12:53:20 +0000 (13:53 +0100)]
mgr/balancer: fix KeyError in balancer rm

Fix the typo in the plan name which leads to a KeyError in balancer
rm.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
Fixes: http://tracker.ceph.com/issues/22470
7 years agorgw: adjust log format for lifecycle 19576/head
Bingyin Zhang [Mon, 18 Dec 2017 10:02:49 +0000 (18:02 +0800)]
rgw: adjust log format for lifecycle

Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>
7 years agomds: handle client session messages when mds is stopping 19234/head
Yan, Zheng [Wed, 29 Nov 2017 10:44:30 +0000 (18:44 +0800)]
mds: handle client session messages when mds is stopping

handle session messages except CEPH_SESSION_REQUEST_OPEN. The problem
I found is that mds ignores CEPH_SESSION_REQUEST_RENEWCAPS, which
causes client sessions to become stale. Locker::revoke_stale_caps()
increases client caps' sequence number. This causes clients to warn
about caps' sequence number mismatch when handle caps import/export
message.

mds should handle CEPH_SESSION_FLUSHMSG_ACK message too. Because
one step of exporting subtree is flushing session messages.

Fixes: http://tracker.ceph.com/issues/22460
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
7 years agoosdc/Journaler: introduce STATE_STOPPING state 19424/head
Yan, Zheng [Mon, 11 Dec 2017 01:06:07 +0000 (09:06 +0800)]
osdc/Journaler: introduce STATE_STOPPING state

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
7 years agoMerge PR #19421 into master
Patrick Donnelly [Mon, 18 Dec 2017 00:10:01 +0000 (16:10 -0800)]
Merge PR #19421 into master

* refs/pull/19421/head:
cephfs-journal-tool: tool would miss to report some invalid range

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge PR #19277 into master
Patrick Donnelly [Mon, 18 Dec 2017 00:08:22 +0000 (16:08 -0800)]
Merge PR #19277 into master

* refs/pull/19277/head:
cephfs: potential adjust failure in lru_expire

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge pull request #19550 from dillaman/wip-22461
Mykola Golub [Sat, 16 Dec 2017 14:32:51 +0000 (16:32 +0200)]
Merge pull request #19550 from dillaman/wip-22461

rbd-mirror: cluster watcher should ensure it has latest OSD map

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agoMerge pull request #19458 from wido/ceph-volume-eol
Alfredo Deza [Sat, 16 Dec 2017 13:38:28 +0000 (08:38 -0500)]
Merge pull request #19458 from wido/ceph-volume-eol

ceph-volume: Add linesep/newline at end of JSON file when writing

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #19518 from jcsp/wip-mgr-access-denied 19467/head
Kefu Chai [Sat, 16 Dec 2017 04:32:40 +0000 (12:32 +0800)]
Merge pull request #19518 from jcsp/wip-mgr-access-denied

mgr: fix "access denied" message

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19515 from tchaikov/wip-cmake-lttng-leak
Kefu Chai [Sat, 16 Dec 2017 04:31:57 +0000 (12:31 +0800)]
Merge pull request #19515 from tchaikov/wip-cmake-lttng-leak

 cmake: link libcommon with libstdc++ statically if WITH_STATIC_LIBSTDCXX

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19490 from adamemerson/wip-hypomodern
Kefu Chai [Sat, 16 Dec 2017 04:31:13 +0000 (12:31 +0800)]
Merge pull request #19490 from adamemerson/wip-hypomodern

Update C++ standard to 14 and clean up

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19486 from liewegas/wip-22419
Kefu Chai [Sat, 16 Dec 2017 04:29:15 +0000 (12:29 +0800)]
Merge pull request #19486 from liewegas/wip-22419

osd: pass pool options to ObjectStore on pg create

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
7 years agoMerge pull request #19385 from liewegas/wip-stdout-logs
Kefu Chai [Sat, 16 Dec 2017 04:27:57 +0000 (12:27 +0800)]
Merge pull request #19385 from liewegas/wip-stdout-logs

mon: allow cluter and debug logs to go to stderr, with appropriate prefix

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agocephfs-journal-tool: tool would miss to report some invalid range 19421/head
root [Sun, 10 Dec 2017 07:35:21 +0000 (15:35 +0800)]
cephfs-journal-tool: tool would miss to report some invalid range

Fixes: http://tracker.ceph.com/issues/22459
Signed-off-by: dongdong tao <tdd21151186@gmail.com>
7 years agocephfs: potential adjust failure in lru_expire 19277/head
root [Fri, 1 Dec 2017 07:26:00 +0000 (15:26 +0800)]
cephfs: potential adjust failure in lru_expire

Fix: the first adjust is no needed,it will never take real effect.
     the second 'adjust' may never get the chance to be executed
     suppose we can reach the second 'adjust', it will crash because the bottom list is empty now.

Fixes: http://tracker.ceph.com/issues/22458
Signed-off-by: dongdong tao <tdd21151186@gmail.com>
7 years agoMerge pull request #19464 from myoungwon/wip-bug-fix-22369
myoungwon oh [Sat, 16 Dec 2017 01:50:44 +0000 (10:50 +0900)]
Merge pull request #19464 from myoungwon/wip-bug-fix-22369

osd: fix unordered read bug (for chunked object)

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #19535 into master
Patrick Donnelly [Fri, 15 Dec 2017 23:31:30 +0000 (15:31 -0800)]
Merge PR #19535 into master

* refs/pull/19535/head:
doc: clarify type of client in config ref

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agorbd-mirror: cluster watcher should ensure it has latest OSD map 19550/head
Jason Dillaman [Fri, 15 Dec 2017 19:51:46 +0000 (14:51 -0500)]
rbd-mirror: cluster watcher should ensure it has latest OSD map

Fixes: http://tracker.ceph.com/issues/22461
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge PR #18512 into master
Patrick Donnelly [Fri, 15 Dec 2017 19:08:29 +0000 (11:08 -0800)]
Merge PR #18512 into master

* refs/pull/18512/head:
mon,mgr,doc,test: standardize argument as role

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #18899 into master
Patrick Donnelly [Fri, 15 Dec 2017 19:08:23 +0000 (11:08 -0800)]
Merge PR #18899 into master

* refs/pull/18899/head:
mds: add asok command that dumps metadata popularity

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #19170 into master
Patrick Donnelly [Fri, 15 Dec 2017 19:08:17 +0000 (11:08 -0800)]
Merge PR #19170 into master

* refs/pull/19170/head:
mds: Improve the log info for read pointers

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
7 years agoMerge PR #19271 into master
Patrick Donnelly [Fri, 15 Dec 2017 19:08:11 +0000 (11:08 -0800)]
Merge PR #19271 into master

* refs/pull/19271/head:
client: update Dir::num_null_dentries in Dentry::{link,unlink}
client: drop null child dentries before try pruning inode's alias

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #19414 into master
Patrick Donnelly [Fri, 15 Dec 2017 19:08:04 +0000 (11:08 -0800)]
Merge PR #19414 into master

* refs/pull/19414/head:
mds: properly eval locks after importing inode

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #19440 into master
Patrick Donnelly [Fri, 15 Dec 2017 19:07:58 +0000 (11:07 -0800)]
Merge PR #19440 into master

* refs/pull/19440/head:
mds: update mds option descriptions
mds: obsolete MDSMap option configs
mds: organize Filesystem class def

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #19540 from dillaman/wip-rbd-trash-list-enoent
Mykola Golub [Fri, 15 Dec 2017 17:18:21 +0000 (19:18 +0200)]
Merge pull request #19540 from dillaman/wip-rbd-trash-list-enoent

rbd: 'trash list --long' will return a failure on non-cloned images

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agorbd: 'trash list --long' will return a failure on non-cloned images 19540/head
Jason Dillaman [Fri, 15 Dec 2017 00:04:33 +0000 (19:04 -0500)]
rbd: 'trash list --long' will return a failure on non-cloned images

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #19493 from cernceph/dvanders_balancer
Kefu Chai [Fri, 15 Dec 2017 07:22:44 +0000 (15:22 +0800)]
Merge pull request #19493 from cernceph/dvanders_balancer

mgr/balancer: cast config vals to int or float

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
7 years agorgw: Silence maybe-uninitialized false positives 19274/head
Brad Hubbard [Fri, 1 Dec 2017 05:47:58 +0000 (15:47 +1000)]
rgw: Silence maybe-uninitialized false positives

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoMerge pull request #19482 from jcsp/wip-22361
Kefu Chai [Fri, 15 Dec 2017 07:16:29 +0000 (15:16 +0800)]
Merge pull request #19482 from jcsp/wip-22361

mgr/balancer: don't use 'foo' tags on commands

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19465 from shinobu-x/no_copy_ctor_assignment
Kefu Chai [Fri, 15 Dec 2017 07:16:03 +0000 (15:16 +0800)]
Merge pull request #19465 from shinobu-x/no_copy_ctor_assignment

common,mds,osd: Explicitly delete copy ctor if noncopyable

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19211 from ZVampirEM77/wip-em-pg-cleanup
Kefu Chai [Fri, 15 Dec 2017 07:05:50 +0000 (15:05 +0800)]
Merge pull request #19211 from ZVampirEM77/wip-em-pg-cleanup

osd: fix typos and some cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19013 from yuyuyu101/wip-fix-racing
Kefu Chai [Fri, 15 Dec 2017 07:04:13 +0000 (15:04 +0800)]
Merge pull request #19013 from yuyuyu101/wip-fix-racing

msg/async/AsyncConnection: unregister connection when racing happened

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19361 from Songweibin/wip-init-image-id
Jason Dillaman [Fri, 15 Dec 2017 03:17:43 +0000 (22:17 -0500)]
Merge pull request #19361 from Songweibin/wip-init-image-id

pybind/rbd: support open the image by image_id

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #19317 from shinobu-x/journaler_trivial_cleanup
Jason Dillaman [Fri, 15 Dec 2017 03:17:17 +0000 (22:17 -0500)]
Merge pull request #19317 from shinobu-x/journaler_trivial_cleanup

journal: trivial cleanup

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #19406 from trociny/wip-deep-copy-pybind
Jason Dillaman [Fri, 15 Dec 2017 03:16:46 +0000 (22:16 -0500)]
Merge pull request #19406 from trociny/wip-deep-copy-pybind

pybind/rbd: add deep_copy method

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #19436 from trociny/wip-22333
Jason Dillaman [Fri, 15 Dec 2017 03:16:23 +0000 (22:16 -0500)]
Merge pull request #19436 from trociny/wip-22333

rbd-nbd: support optionally setting device timeout

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #19477 from wido/mgr-int-json
Alfredo Deza [Thu, 14 Dec 2017 23:01:46 +0000 (18:01 -0500)]
Merge pull request #19477 from wido/mgr-int-json

ceph-volume: Try to cast OSD metadata to int while scanning directory

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agodoc: clarify type of client in config ref 19535/head
Patrick Donnelly [Thu, 14 Dec 2017 20:37:17 +0000 (12:37 -0800)]
doc: clarify type of client in config ref

The kernel configuration is different.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agocommon: Switch from boost::shared_mutex to std::shared_mutex 19490/head
Adam C. Emerson [Wed, 6 Dec 2017 20:52:17 +0000 (15:52 -0500)]
common: Switch from boost::shared_mutex to std::shared_mutex

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agocommon: Get rid of artifact filename
Adam C. Emerson [Sat, 9 Dec 2017 23:57:20 +0000 (18:57 -0500)]
common: Get rid of artifact filename

Since we're on C++14, we're just backporting from future standards
generally.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agocommon: Remove backported max and make_unique
Adam C. Emerson [Wed, 6 Dec 2017 02:56:19 +0000 (21:56 -0500)]
common: Remove backported max and make_unique

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoMerge pull request #19516 from tchaikov/wip-install-deps
Kefu Chai [Thu, 14 Dec 2017 16:02:39 +0000 (00:02 +0800)]
Merge pull request #19516 from tchaikov/wip-install-deps

install-deps.sh: use tee for writing a file

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
7 years agoMerge pull request #19517 from qrGitHub/wip-rgw-typo-signle
Jos Collin [Thu, 14 Dec 2017 12:08:26 +0000 (12:08 +0000)]
Merge pull request #19517 from qrGitHub/wip-rgw-typo-signle

rgw: fix typo signle to single

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agomgr: fix "access denied" message 19518/head
John Spray [Thu, 14 Dec 2017 11:41:02 +0000 (11:41 +0000)]
mgr: fix "access denied" message

As pointed out on https://github.com/ceph/ceph/pull/18716

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #18716 from shinobu-x/sk-mgr_daemonserver
John Spray [Thu, 14 Dec 2017 11:38:00 +0000 (11:38 +0000)]
Merge pull request #18716 from shinobu-x/sk-mgr_daemonserver

mgr/DaemonServer: [Cleanup] Remove redundant code

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agorgw: fix typo signle to single 19517/head
Bingyin Zhang [Thu, 14 Dec 2017 11:21:38 +0000 (19:21 +0800)]
rgw: fix typo signle to single

Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>
7 years agoinstall-deps.sh: use tee for writing a file 19516/head
Kefu Chai [Thu, 14 Dec 2017 11:06:51 +0000 (19:06 +0800)]
install-deps.sh: use tee for writing a file

because the stdout redirect is performed by current shell not `$SUDO
cat`, so $SUDO does not help here. use `$SUDO tee` instead, which is
able to read the stdin and write to the given file just as expected.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19492 from dillaman/wip-rbd-mirror-dashboard
Mykola Golub [Thu, 14 Dec 2017 11:05:59 +0000 (13:05 +0200)]
Merge pull request #19492 from dillaman/wip-rbd-mirror-dashboard

rbd-mirror: ensure unique service daemon name is utilized

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agocmake: link global-static against common 19515/head
Kefu Chai [Thu, 14 Dec 2017 10:52:42 +0000 (18:52 +0800)]
cmake: link global-static against common

* as global-static references symbols offered by common.
* and remove DPDK_LIBRARIES from global, as it is libcommon which
  is using DPDK.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: link libcommon with libstdc++ statically if WITH_STATIC_LIBSTDCXX
Kefu Chai [Thu, 14 Dec 2017 07:07:30 +0000 (15:07 +0800)]
cmake: link libcommon with libstdc++ statically if WITH_STATIC_LIBSTDCXX

this matches the linkage of libceph-common, because valgrind reports
Leak_StillReachable if daemons are linked against libceph-common, will
link daemons against common instead, and let common link libstdc++
statically, if WITH_STATIC_LIBSTDCXX=ON.

this change also reverts e6695bb6

Fixes: http://tracker.ceph.com/issues/22438
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoglobal: remove unused header
Kefu Chai [Thu, 14 Dec 2017 09:36:05 +0000 (17:36 +0800)]
global: remove unused header

the asock functionality was moved into ceph_context.cc in 12f6e8f1.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocommon/mds/osd: Explicitly delete if no copy, and remove incorrect comment 19465/head
Shinobu Kinjo [Wed, 13 Dec 2017 05:48:09 +0000 (14:48 +0900)]
common/mds/osd: Explicitly delete if no copy, and remove incorrect comment

Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>
7 years agorgw: optimize time skew check 19511/head
Bingyin Zhang [Thu, 14 Dec 2017 08:03:36 +0000 (16:03 +0800)]
rgw: optimize time skew check

* Move query string check out of function is_time_skew_ok;

Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>
7 years agorgw: fix return value of auth v2/v4 19310/head
Bingyin Zhang [Thu, 14 Dec 2017 08:38:35 +0000 (16:38 +0800)]
rgw: fix return value of auth v2/v4

* The return value of auth v2/v4 in RGW is different from that in AWS:
*     1. When 'Expires' is missing in auth v2 query string request, AWS
*     returns AccessDenied while RGW returns SignatureDoesNotMatch;
*     2. When 'X-Amz-Expires' is missing in auth v4 query string
*     request, AWS returns AuthorizationQueryParametersError while RGW
*     returns RequestTimeTooSkewed;
* Changes:
*     1. When 'Expires' is missing in auth v2 query string request,
*     change RGW's return value to AccessDenied;
*     2. When 'X-Amz-Expires' is missing in auth v4 query string
*     request, change RGW's return value to AccessDenied;
*     3. remove time skew check from parse_v4_query_string;

Fixes: http://tracker.ceph.com/issues/22439
Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>
7 years agocommon: Swap C++14 template type aliases for variables
Adam C. Emerson [Sat, 9 Dec 2017 06:42:35 +0000 (01:42 -0500)]
common: Swap C++14 template type aliases for variables

C++14 provides the ability to define template variables, which the C++17
library puts to good use. We define those same aliases.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agorgw: add "Accept-Ranges" to response header of Swift API 17967/head
tone-zhang [Tue, 26 Sep 2017 09:00:23 +0000 (09:00 +0000)]
rgw: add "Accept-Ranges" to response header of Swift API

"Accept-ranges" is missing from the Response header of swift API
returned by Ceph rgw.

Fixes: http://tracker.ceph.com/issues/21554
Signed-off-by: Tone Zhang <tone.zhang@arm.com>
7 years agobuild: Uplevel to C++14
Adam C. Emerson [Sat, 9 Dec 2017 04:34:59 +0000 (23:34 -0500)]
build: Uplevel to C++14

Fix a couple problems.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agovstart_runner: ignore failed dentry invalidation 19533/head
Patrick Donnelly [Thu, 14 Dec 2017 02:07:00 +0000 (18:07 -0800)]
vstart_runner: ignore failed dentry invalidation

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agovstart_runner: set ec_profile attribute
Patrick Donnelly [Thu, 14 Dec 2017 01:50:32 +0000 (17:50 -0800)]
vstart_runner: set ec_profile attribute

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #19470 from tchaikov/wip-async-dpdk
Kefu Chai [Thu, 14 Dec 2017 02:44:58 +0000 (10:44 +0800)]
Merge pull request #19470 from tchaikov/wip-async-dpdk

msg/async: update to work with dpdk shipped with spdk v17.10

Reviewed-by: Haomai Wang <haomai@xsky.com>
7 years agoMerge pull request #19466 from shinobu-x/super_redundant_public_label
Sage Weil [Thu, 14 Dec 2017 02:36:37 +0000 (20:36 -0600)]
Merge pull request #19466 from shinobu-x/super_redundant_public_label

osdc: Remove a bit too redundant public label...

7 years agoMerge pull request #19494 from smithfarm/wip-22362
Sage Weil [Thu, 14 Dec 2017 02:33:15 +0000 (20:33 -0600)]
Merge pull request #19494 from smithfarm/wip-22362

build/ops: rpm: set permissions 0755 on rbd resource agent

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #19495 from ZVampirEM77/wip-em-pg-cleanup2
Sage Weil [Thu, 14 Dec 2017 02:32:40 +0000 (20:32 -0600)]
Merge pull request #19495 from ZVampirEM77/wip-em-pg-cleanup2

osd/PrimaryLogPG: cleanup do_sub_op && do_sub_op_reply and define soid in prepare_transaction more appropriate

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agomds: update mds option descriptions 19440/head
Patrick Donnelly [Sat, 18 Nov 2017 05:13:42 +0000 (21:13 -0800)]
mds: update mds option descriptions

Fixes: http://tracker.ceph.com/issues/21764
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agomds: obsolete MDSMap option configs
Patrick Donnelly [Tue, 12 Dec 2017 19:09:19 +0000 (11:09 -0800)]
mds: obsolete MDSMap option configs

These configs were used for initialization but it is more appropriate to
require setting these file system attributes via `ceph fs set`. This is similar
to what was already done with max_mds. There are new variables added for `fs
set` where missing.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #19425 from kungf/calc_replicated_acting
Yuri Weinstein [Wed, 13 Dec 2017 23:39:56 +0000 (15:39 -0800)]
Merge pull request #19425 from kungf/calc_replicated_acting

osd: reduce all_info map find to get primary

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
7 years agoMerge pull request #17691 from amitkumar50/cov-osd-3
Yuri Weinstein [Wed, 13 Dec 2017 23:37:20 +0000 (15:37 -0800)]
Merge pull request #17691 from amitkumar50/cov-osd-3

osd: Initialization of data members

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #19033 from david-z/wip-fix-fusestore-df
Yuri Weinstein [Wed, 13 Dec 2017 23:36:28 +0000 (15:36 -0800)]
Merge pull request #19033 from david-z/wip-fix-fusestore-df

os/FuseStore: fix incorrect used space statistics for fuse's statfs interface

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agobuild/ops: rpm: set permissions 0755 on rbd resource agent 19494/head
Nathan Cutler [Wed, 13 Dec 2017 17:15:27 +0000 (18:15 +0100)]
build/ops: rpm: set permissions 0755 on rbd resource agent

Fixes: http://tracker.ceph.com/issues/22362
Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #19468 from tchaikov/wip-install-deps.sh
Kefu Chai [Wed, 13 Dec 2017 16:33:59 +0000 (00:33 +0800)]
Merge pull request #19468 from tchaikov/wip-install-deps.sh

install-deps.sh: avoid re-installing g++-7

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>