]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoos/bluestore: avoid unneeded BlobRefing in _do_read(). 19864/head
Radoslaw Zarzynski [Fri, 5 Jan 2018 02:30:22 +0000 (03:30 +0100)]
os/bluestore: avoid unneeded BlobRefing in _do_read().

The hottest place in the terms of CPU cycles according to `perf annotate`:
```
       |          intrusive_ptr(intrusive_ptr const & rhs): px( rhs.px )
  0,04 | 365:   mov    0x28(%rax),%r12
       |          {
       |              if( px != 0 ) intrusive_ptr_add_ref( px );
  0,41 |        test   %r12,%r12
       |      ↓ je     37c
       |      _ZNSt13__atomic_baseIiEppEv():
  0,04 |        lock   addl   $0x1,(%r12)
 19,75 |        mov    0xa8(%rsp),%rax
       |      _ZN9BlueStore8_do_readEPNS_10CollectionEN5boost13intrusive_ptrINS_5OnodeEEEmmRN4ceph6buffer4listEj():
       |          }
       |          BlobRef bptr = lp->blob;
       |          unsigned l_off = pos - lp->logical_offset
       | 37c:   mov    0xa0(%rsp),%rdx
       |        sub    0x18(%rax),%edx
       |          unsigned b_off = l_off + lp->blob_offset;
  0,08 |        mov    0x1c(%rax),%ecx
```

With the patch applied:

```
       |          T * operator->() const
       |          {
       |              BOOST_ASSERT( px != 0 );
       |              return px;
       |        mov    0x28(%rcx),%rax
       |        mov    0x8(%rax),%rax
       |      _ZN9BlueStore8_do_readEPNS_10CollectionEN5boost13intrusive_ptrINS
       |          unsigned b_len = std::min(left, lp->length - l_off);
       |
       |          ready_regions_t cache_res;
       |          interval_set<uint32_t> cache_interval;
       |          bptr->shared_blob->bc.read(
 17,78 |        lea    0x18(%rax),%rdi
       |      _ZNK5boost13intrusive_ptrIN9BlueStore10CollectionEEcvbEv():
       |      #if !defined( BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS ) && !
       |          && !(defined(__SUNPRO_CC) && BOOST_WORKAROUND(__SUNPRO_CC, <=
       |
       |          explicit operator bool () const BOOST_NOEXCEPT
       |          {
       |              return px != 0;
  0,07 |        mov    0x8(%rax),%rax
```

Signed-off-by: Radoslaw Zarzynski <rzarzyns@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 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 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 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 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 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>
7 years agosrc/test: remove unnecessary stat 19464/head
myoungwon oh [Wed, 13 Dec 2017 16:27:34 +0000 (01:27 +0900)]
src/test: remove unnecessary stat

This commit prevents unnecessary stat that
invokes promote_object()
promote_object() makes object clean state

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
7 years agoqa/suites/rados/thrash: remove write op
myoungwon oh [Wed, 13 Dec 2017 15:26:19 +0000 (00:26 +0900)]
qa/suites/rados/thrash: remove write op

current chunked object and ChunkReadOp are
only for the read case.
write op and promote_object() still be tested without ChunkReadOp
by another ceph_test_rados in the same test suite (with --set_chunk)

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
7 years agomgr/balancer: cast config vals to int or float 19493/head
Dan van der Ster [Wed, 13 Dec 2017 16:02:44 +0000 (17:02 +0100)]
mgr/balancer: cast config vals to int or float

upmap_max_iterations and other config vals need to be numeric.
Cast them appropriately.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
Fixes: http://tracker.ceph.com/issues/22429
7 years agomgr/dashboard: use unique instance id as daemon identifier 19492/head
Jason Dillaman [Thu, 30 Nov 2017 19:06:32 +0000 (14:06 -0500)]
mgr/dashboard: use unique instance id as daemon identifier

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agomgr/dashboard: utilize application metadata to detect RBD pools
Jason Dillaman [Thu, 30 Nov 2017 19:03:56 +0000 (14:03 -0500)]
mgr/dashboard: utilize application metadata to detect RBD pools

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: ensure each daemon instance uses a unique service name
Jason Dillaman [Thu, 30 Nov 2017 01:05:06 +0000 (20:05 -0500)]
rbd-mirror: ensure each daemon instance uses a unique service name

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoPrimaryLogPG: cleanup do_sub_op and do_sub_op_reply 19495/head
Enming Zhang [Wed, 13 Dec 2017 15:05:44 +0000 (23:05 +0800)]
PrimaryLogPG: cleanup do_sub_op and do_sub_op_reply

The related code has been cleaned in https://github.com/ceph/ceph/pull/17247,
but it seems something was missed.

Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
7 years agoPrimaryLogPG: define soid just before using it
Enming Zhang [Wed, 13 Dec 2017 14:32:32 +0000 (22:32 +0800)]
PrimaryLogPG: define soid just before using it

Define the soid just before using it to avoid a redundant
definition if an error happens and function prepare_transaction
returns directly.

Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
7 years agoMerge pull request #19453 from liewegas/wip-pg-primary
Sage Weil [Wed, 13 Dec 2017 14:22:30 +0000 (08:22 -0600)]
Merge pull request #19453 from liewegas/wip-pg-primary

osd/PG: include primary in PG operator<< for ec pools

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoosd/PG: pass pool options to ObjectStore on pg create 19486/head
Sage Weil [Wed, 13 Dec 2017 14:19:59 +0000 (08:19 -0600)]
osd/PG: pass pool options to ObjectStore on pg create

We were handling the load case and the pool change case, but not newly
created PG.

Fixes: http://tracker.ceph.com/issues/22419
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19478 from tchaikov/wip-silence-warnings
Kefu Chai [Wed, 13 Dec 2017 14:08:50 +0000 (22:08 +0800)]
Merge pull request #19478 from tchaikov/wip-silence-warnings

qa/standalone/ceph-helpers.sh: silence ceph-disk DEPRECATION_WARNING

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agomgr/balancer: don't use 'foo' tags on commands 19482/head
John Spray [Wed, 13 Dec 2017 13:08:46 +0000 (13:08 +0000)]
mgr/balancer: don't use 'foo' tags on commands

This looks weird in logs when code elsewhere logs
that it didn't handle a command with tag 'foo'

Fixes: http://tracker.ceph.com/issues/22361
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #19404 from jan--f/mon-fix-digest-timer-inactive-paxos
Kefu Chai [Wed, 13 Dec 2017 12:34:29 +0000 (20:34 +0800)]
Merge pull request #19404 from jan--f/mon-fix-digest-timer-inactive-paxos

mon: reenable timer to send digest when paxos is temporarily inactive

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19366 from liewegas/wip-21557
Kefu Chai [Wed, 13 Dec 2017 12:02:10 +0000 (20:02 +0800)]
Merge pull request #19366 from liewegas/wip-21557

osd: more debugging for snapmapper bug

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19367 from wjwithagen/wip-wjw-clang-xlist-string
Kefu Chai [Wed, 13 Dec 2017 12:01:25 +0000 (20:01 +0800)]
Merge pull request #19367 from wjwithagen/wip-wjw-clang-xlist-string

include: xlist: Fix Clang error for missing string

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19365 from liewegas/wip-tell
Kefu Chai [Wed, 13 Dec 2017 11:58:41 +0000 (19:58 +0800)]
Merge pull request #19365 from liewegas/wip-tell

qa/tasks/ceph_manager: tolerate tell osd.* error

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19353 from shinobu-x/common_clock
Kefu Chai [Wed, 13 Dec 2017 11:57:56 +0000 (19:57 +0800)]
Merge pull request #19353 from shinobu-x/common_clock

common: Remove ceph_clock_gettime, extern keyword

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19352 from chardan/jfw-wip-issue-20811
Kefu Chai [Wed, 13 Dec 2017 11:53:42 +0000 (19:53 +0800)]
Merge pull request #19352 from chardan/jfw-wip-issue-20811

osd: migrate PGLOG_* macros to constexpr

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19329 from ZVampirEM77/cleanup-revise-have
Kefu Chai [Wed, 13 Dec 2017 11:52:48 +0000 (19:52 +0800)]
Merge pull request #19329 from ZVampirEM77/cleanup-revise-have

osd/PGLog: cleanup unused function revise_have

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19056 from adamemerson/wip-with-val
Kefu Chai [Wed, 13 Dec 2017 11:51:34 +0000 (19:51 +0800)]
Merge pull request #19056 from adamemerson/wip-with-val

common/config: use with_val() for better performance

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19114 from tchaikov/wip-rm-request-slow
John Spray [Wed, 13 Dec 2017 11:46:34 +0000 (11:46 +0000)]
Merge pull request #19114 from tchaikov/wip-rm-request-slow

mgr/PGMap: drop REQUEST_{SLOW,STUCK} HEALTH_WARNs

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoqa/standalone/ceph-helpers.sh: silence ceph-disk DEPRECATION_WARNING 19478/head
Kefu Chai [Wed, 13 Dec 2017 11:42:34 +0000 (19:42 +0800)]
qa/standalone/ceph-helpers.sh: silence ceph-disk DEPRECATION_WARNING

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19229 from wido/mgr-influx
John Spray [Wed, 13 Dec 2017 11:35:17 +0000 (11:35 +0000)]
Merge pull request #19229 from wido/mgr-influx

mgr/influx: PEP-8 and other fixes to Influx module

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoceph-volume: Try to cast OSD metadata to int while scanning directory 19477/head
Wido den Hollander [Wed, 13 Dec 2017 10:20:53 +0000 (11:20 +0100)]
ceph-volume: Try to cast OSD metadata to int while scanning directory

By doing so values like 'whoami' and 'bluefs' will be stored as a
integer in the resulting JSON rather then a String.

Signed-off-by: Wido den Hollander <wido@42on.com>
7 years agoMerge pull request #19472 from qrGitHub/wip-rgw-typo-woild
Jos Collin [Wed, 13 Dec 2017 09:39:36 +0000 (09:39 +0000)]
Merge pull request #19472 from qrGitHub/wip-rgw-typo-woild

rgw: fix typo woild to would

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agorgw: correct typo woild to would 19472/head
Bingyin Zhang [Wed, 13 Dec 2017 07:56:13 +0000 (15:56 +0800)]
rgw: correct typo woild to would

Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>
7 years agomsg/async: update to work with dpdk shipped with spdk v17.10 19470/head
Kefu Chai [Wed, 13 Dec 2017 06:55:15 +0000 (14:55 +0800)]
msg/async: update to work with dpdk shipped with spdk v17.10

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: DPDK works w/o CRYPTOPP
Kefu Chai [Wed, 13 Dec 2017 06:54:17 +0000 (14:54 +0800)]
cmake: DPDK works w/o CRYPTOPP

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoosd: fix unordered read bug (for chunked object)
myoungwon oh [Wed, 13 Dec 2017 04:38:39 +0000 (13:38 +0900)]
osd: fix unordered read bug (for chunked object)

The current implementation for chunked object only supports
proxy_read(if offset is within range) and write(local write)
In this case, a read request can be handled before a write request.
This commit prevents unordered read processing because
proxy_read() will be executed if the chunk is missing state.
If chunked object has been overwritten, its state will not be missing.

Fixes: http://tracker.ceph.com/issues/22369
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
7 years agoinstall-deps.sh: avoid re-installing g++-7 19468/head
Kefu Chai [Wed, 13 Dec 2017 06:22:39 +0000 (14:22 +0800)]
install-deps.sh: avoid re-installing g++-7

* add ubuntu-toolchain-r mirrors in case the ppa.launchpad.net is not
  accessible
* add ppa repo manually, it's faster than installing
  `software-properties-common` and then launch `add-apt-repository`
* hardwire $old to the gcc version shipped by the distro, simpler this
  way.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoosdc: Remove a bit too redundant public label... 19466/head
Shinobu Kinjo [Wed, 13 Dec 2017 05:59:22 +0000 (14:59 +0900)]
osdc: Remove a bit too redundant public label...

Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>
7 years agomsg/async/AsyncConnection: unregister connection when racing happened 19013/head
Haomai Wang [Wed, 15 Nov 2017 10:33:17 +0000 (18:33 +0800)]
msg/async/AsyncConnection: unregister connection when racing happened

Signed-off-by: Haomai Wang <haomai@xsky.com>
7 years agoMerge pull request #17651 from ceph/wip-ceph-deploy-upgrade
vasukulkarni [Wed, 13 Dec 2017 00:10:47 +0000 (16:10 -0800)]
Merge pull request #17651 from ceph/wip-ceph-deploy-upgrade

qa/tests: Wip ceph deploy upgrade

7 years agoceph-volume: Add linesep/newline at end of JSON file when writing 19458/head
Wido den Hollander [Tue, 12 Dec 2017 20:27:07 +0000 (21:27 +0100)]
ceph-volume: Add linesep/newline at end of JSON file when writing

Instead of:

    "systemd": "",
    "type": "bluestore",
    "whoami": "0"
  }root@alpha:~#

A newline is added to the JSON file when writing:

    "type": "bluestore",
    "whoami": "0"
  }
  root@alpha:~#

Makes it a bit easier to read the JSON files on a terminal

Signed-off-by: Wido den Hollander <wido@42on.com>
7 years agoMerge pull request #19144 from zhangsw/cleanup-rgwputobj-md5
Yuri Weinstein [Tue, 12 Dec 2017 16:28:43 +0000 (08:28 -0800)]
Merge pull request #19144 from zhangsw/cleanup-rgwputobj-md5

rgw: no need to deal with md5 header in get_data.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19167 from joke-lee/Bucket_Policy_SourceIp_Condition
Yuri Weinstein [Tue, 12 Dec 2017 16:28:25 +0000 (08:28 -0800)]
Merge pull request #19167 from joke-lee/Bucket_Policy_SourceIp_Condition

rgw: implement ipv4 aws:SourceIp condition for bucket policy

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19210 from Liuchang0812/rgw-camelcase
Yuri Weinstein [Tue, 12 Dec 2017 16:27:23 +0000 (08:27 -0800)]
Merge pull request #19210 from Liuchang0812/rgw-camelcase

 rgw: use camelcase format in request headers

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoMerge pull request #19236 from dplyakin/get-website-error-code
Yuri Weinstein [Tue, 12 Dec 2017 16:26:32 +0000 (08:26 -0800)]
Merge pull request #19236 from dplyakin/get-website-error-code

rgw: fix GET website response error code

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19250 from qrGitHub/wip-rgw-unused-param2
Yuri Weinstein [Tue, 12 Dec 2017 16:25:54 +0000 (08:25 -0800)]
Merge pull request #19250 from qrGitHub/wip-rgw-unused-param2

rgw: remove unused param in AWSGeneralAbstractor::get_auth_data_v4

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoMerge pull request #19390 from yaozongyou/remove-duplicated-include
Yuri Weinstein [Tue, 12 Dec 2017 16:25:17 +0000 (08:25 -0800)]
Merge pull request #19390 from yaozongyou/remove-duplicated-include

rgw,common: remove already included header files

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Liu-Chunmei <chunmei.liu@intel.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agoMerge pull request #19391 from qrGitHub/wip-rgw-memory-optimize
Yuri Weinstein [Tue, 12 Dec 2017 16:23:05 +0000 (08:23 -0800)]
Merge pull request #19391 from qrGitHub/wip-rgw-memory-optimize

rgw: optimize memory usage in function rgw_bucket::get_key

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19430 from tianshan/fix_recursive_lock
Yuri Weinstein [Tue, 12 Dec 2017 16:22:47 +0000 (08:22 -0800)]
Merge pull request #19430 from tianshan/fix_recursive_lock

rgw: fix recursive lock

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoosd/PG: include primary in PG operator<< for ec pools 19453/head
Sage Weil [Tue, 12 Dec 2017 15:22:37 +0000 (09:22 -0600)]
osd/PG: include primary in PG operator<< for ec pools

Otherwise it is confusing!

Signed-off-by: Sage Weil <sage@redhat.com>