]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoMerge pull request #22756 from wjwithagen/wjw-fix-missing-vector
Kefu Chai [Fri, 29 Jun 2018 02:04:55 +0000 (10:04 +0800)]
Merge pull request #22756 from wjwithagen/wjw-fix-missing-vector

mgr: `#include <vector>` for clang

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22752 from tchaikov/wip-freebsd-w/o-rdma
Kefu Chai [Fri, 29 Jun 2018 02:02:49 +0000 (10:02 +0800)]
Merge pull request #22752 from tchaikov/wip-freebsd-w/o-rdma

cmake,do_freebsd.sh: disable rdma features

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Haodong Tang <haodong.tang@intel.com>
7 years agoMerge pull request #22743 from rzarzynski/wip-common-drop-static_assert.h
Kefu Chai [Fri, 29 Jun 2018 02:00:59 +0000 (10:00 +0800)]
Merge pull request #22743 from rzarzynski/wip-common-drop-static_assert.h

common: drop static_assert.h as it looks unused.

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22720 from rzarzynski/wip-build-static-ceph-common-in-osd
Kefu Chai [Fri, 29 Jun 2018 02:00:08 +0000 (10:00 +0800)]
Merge pull request #22720 from rzarzynski/wip-build-static-ceph-common-in-osd

cmake: link ceph-osd with common statically

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22727 from dzafman/wip-21664
David Zafman [Thu, 28 Jun 2018 23:59:21 +0000 (19:59 -0400)]
Merge pull request #22727 from dzafman/wip-21664

qa/standalone/scrub: When possible show side-by-side diff in addition to regular diff

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22763 from dzafman/wip-remove-sudo
David Zafman [Thu, 28 Jun 2018 22:37:24 +0000 (18:37 -0400)]
Merge pull request #22763 from dzafman/wip-remove-sudo

qa: Don't use sudo when moving logs

Reviewed-by: Neha Ojha <nojha@redhat.com>
7 years agoMerge pull request #22441 from ErwanAliasr1/evelu-makecheck
David Zafman [Thu, 28 Jun 2018 18:55:12 +0000 (14:55 -0400)]
Merge pull request #22441 from ErwanAliasr1/evelu-makecheck

Improving make check reliability

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoqa: Don't use sudo when moving logs 22763/head
David Zafman [Thu, 28 Jun 2018 16:17:06 +0000 (09:17 -0700)]
qa: Don't use sudo when moving logs

Caused by: f0964beac5b8b54bc44a11bfb50bdea1f2ae8825

Signed-off-by: David Zafman <dzafman@redhat.com>
7 years agoMerge pull request #22565 from tchaikov/wip-seastar-thread-pool
Kefu Chai [Thu, 28 Jun 2018 15:56:34 +0000 (23:56 +0800)]
Merge pull request #22565 from tchaikov/wip-seastar-thread-pool

crimson/thread: add thread pool

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agocmake: add crimson static library 22565/head
Kefu Chai [Thu, 14 Jun 2018 06:08:53 +0000 (14:08 +0800)]
cmake: add crimson static library

libcrimson consolidates the object library of crimson_{net,thread} and
seastar_{buffer,net,thread}_objs. by offering a static library glueing
seastar,  we can link against these libraries and its dependencies in a
simpler way.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocrimson/thread: add a thread pool impl
Kefu Chai [Thu, 7 Jun 2018 12:23:11 +0000 (20:23 +0800)]
crimson/thread: add a thread pool impl

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22007 from dalgaaf/wip-da-SCA-20180514
Kefu Chai [Thu, 28 Jun 2018 15:39:55 +0000 (23:39 +0800)]
Merge pull request #22007 from dalgaaf/wip-da-SCA-20180514

rgw, common: Fixes SCA issues

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: extract the RDMA libraries interface properties out 22752/head
Kefu Chai [Thu, 28 Jun 2018 09:05:53 +0000 (17:05 +0800)]
cmake: extract the RDMA libraries interface properties out

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agodo_freebsd.sh: disable rdma features
Kefu Chai [Thu, 28 Jun 2018 05:28:20 +0000 (13:28 +0800)]
do_freebsd.sh: disable rdma features

FreeBSD does have libibiverb and librdmacm, but we disable them anyway
for minimal dependency.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: consolidate WITH_{VERBS,RDMACM}
Kefu Chai [Thu, 28 Jun 2018 08:56:58 +0000 (16:56 +0800)]
cmake: consolidate WITH_{VERBS,RDMACM}

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22759 from ricardoasmarques/wip-fix-rbd-features-style
Lenz Grimmer [Thu, 28 Jun 2018 15:11:32 +0000 (17:11 +0200)]
Merge pull request #22759 from ricardoasmarques/wip-fix-rbd-features-style

mgr/dashboard: Fix RBD features style

Reviewed-by: Tiago Melo <tmelo@suse.com>
7 years agoMerge pull request #22750 from joscollin/wip-dashboard-intro
Lenz Grimmer [Thu, 28 Jun 2018 11:40:15 +0000 (13:40 +0200)]
Merge pull request #22750 from joscollin/wip-dashboard-intro

doc: updated the overview and glossary for dashboard

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
7 years agomgr/dashboard: Fix RBD features style 22759/head
Ricardo Marques [Thu, 28 Jun 2018 11:00:03 +0000 (12:00 +0100)]
mgr/dashboard: Fix RBD features style

Signed-off-by: Ricardo Marques <rimarques@suse.com>
7 years agodoc: Updated dashboard doc references 22750/head
Jos Collin [Thu, 28 Jun 2018 08:40:36 +0000 (14:10 +0530)]
doc: Updated dashboard doc references

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agodoc: updated the overview and glossary for dashboard
Jos Collin [Thu, 28 Jun 2018 03:49:29 +0000 (09:19 +0530)]
doc: updated the overview and glossary for dashboard

* Updated the overview of dashboard to avoid many paragraphs,
some outdated statements, etc.
* Updated glossary, glossary references and urls
* Dropped unnecessary term *module* in possible places
* Unified the new dashboard name as *Ceph Manager Dashboard*

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agomgr: fix Clangs/FreeBSD missing vector 22756/head
Willem Jan Withagen [Thu, 28 Jun 2018 08:24:15 +0000 (10:24 +0200)]
mgr: fix Clangs/FreeBSD missing vector

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agoMerge pull request #22702 from dzafman/wip-standalone-log
David Zafman [Thu, 28 Jun 2018 05:57:25 +0000 (01:57 -0400)]
Merge pull request #22702 from dzafman/wip-standalone-log

qa: For teuthology copy logs to teuthology expected location

Reviewed-by: Neha Ojha <nojha@redhat.com>
7 years agocmake: remove stale comments
Kefu Chai [Thu, 28 Jun 2018 05:21:02 +0000 (13:21 +0800)]
cmake: remove stale comments

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22726 from yuriw/wip-yuriw-crontab
Josh Durgin [Wed, 27 Jun 2018 23:13:51 +0000 (16:13 -0700)]
Merge pull request #22726 from yuriw/wip-yuriw-crontab

qa/tests - added mimic-p2p suite

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
7 years agoMerge PR #22560 into master
Patrick Donnelly [Wed, 27 Jun 2018 21:19:03 +0000 (14:19 -0700)]
Merge PR #22560 into master

* refs/pull/22560/head:
qa/fs/upgrade/snaps: whitelist inconsistent rstat
mds: track snapshot count in rstat
mds: add MAY_SNAPSHOT in MDSAuthCaps

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22719 into master
Patrick Donnelly [Wed, 27 Jun 2018 19:50:33 +0000 (12:50 -0700)]
Merge PR #22719 into master

* refs/pull/22719/head:
qa: fix symlinks indirectly pointing at qa to .qa
qa: add .qa helper link

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #22631 from tianshan/fix_notify_thread
Casey Bodley [Wed, 27 Jun 2018 19:39:02 +0000 (15:39 -0400)]
Merge pull request #22631 from tianshan/fix_notify_thread

rgw: fix meta and data notify thread miss stop cr manager

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agocommon: drop static_assert.h as it looks unused. 22743/head
Radoslaw Zarzynski [Wed, 27 Jun 2018 19:36:19 +0000 (21:36 +0200)]
common: drop static_assert.h as it looks unused.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoMerge pull request #22632 from tianshan/fix_index_zones_trace
Casey Bodley [Wed, 27 Jun 2018 18:29:52 +0000 (14:29 -0400)]
Merge pull request #22632 from tianshan/fix_index_zones_trace

rgw: fix index complete miss zones_trace set

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #22660 from cfanz/wip-rgw-fix-24603
Casey Bodley [Wed, 27 Jun 2018 18:29:28 +0000 (14:29 -0400)]
Merge pull request #22660 from cfanz/wip-rgw-fix-24603

rgw-multisite: fix endless loop in RGWBucketShardIncrementalSyncCR

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge PR #22725 into master
Patrick Donnelly [Wed, 27 Jun 2018 18:13:37 +0000 (11:13 -0700)]
Merge PR #22725 into master

* refs/pull/22725/head:
qa/workunits/suites/blogbench.sh: use correct dir name

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge PR #22656 into master
Patrick Donnelly [Wed, 27 Jun 2018 17:31:30 +0000 (10:31 -0700)]
Merge PR #22656 into master

* refs/pull/22656/head:
doc: update experimental features - snapshots
doc: highlight the flags

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #22698 from cbodley/wip-async-shared-mutex
Casey Bodley [Wed, 27 Jun 2018 16:55:32 +0000 (12:55 -0400)]
Merge pull request #22698 from cbodley/wip-async-shared-mutex

common: reintroduce async SharedMutex

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoMerge pull request #22724 from ceph/rm-23941
Alfredo Deza [Wed, 27 Jun 2018 15:56:09 +0000 (11:56 -0400)]
Merge pull request #22724 from ceph/rm-23941

ceph-volume: error on commands that need ceph.conf to operate

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agobuild: link ceph-osd with common statically. Enforce IE TLS model. 22720/head
Radoslaw Zarzynski [Thu, 21 Jun 2018 19:05:16 +0000 (15:05 -0400)]
build: link ceph-osd with common statically. Enforce IE TLS model.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoMerge pull request #22710 from tchaikov/wip-config-without-lock
Kefu Chai [Wed, 27 Jun 2018 13:28:20 +0000 (21:28 +0800)]
Merge pull request #22710 from tchaikov/wip-config-without-lock

common: add lockless `md_config_t`

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #22712 from tspmelo/wip-package-version
Lenz Grimmer [Wed, 27 Jun 2018 13:12:54 +0000 (15:12 +0200)]
Merge pull request #22712 from tspmelo/wip-package-version

mgr/dashboard: fix the version of all frontend dependencies

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #22734 from s0nea/wip-update-map
Jos Collin [Wed, 27 Jun 2018 13:08:40 +0000 (18:38 +0530)]
Merge pull request #22734 from s0nea/wip-update-map

githubmap, organizationmap: cleanup and add/update contributors/affiliation

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #20297 from tanghaodong25/rdma-cm
Kefu Chai [Wed, 27 Jun 2018 12:37:48 +0000 (20:37 +0800)]
Merge pull request #20297 from tanghaodong25/rdma-cm

msg/async/rdma: add iWARP RDMA protocol support

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoceph-volume: error on commands that need ceph.conf to operate 22724/head
Andrew Schoen [Tue, 26 Jun 2018 19:19:43 +0000 (14:19 -0500)]
ceph-volume: error on commands that need ceph.conf to operate

We had been ignoring the failure to load ceph.conf for all subcommands
but most of them require that a ceph.conf be present. This changes that
so only commands that do not need ceph.conf ignore the failure to find
it.

Fixes: http://tracker.ceph.com/issues/23941
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoorganizationmap: add openATTIC team affiliation 22734/head
Tatjana Dehler [Wed, 27 Jun 2018 09:30:40 +0000 (11:30 +0200)]
organizationmap: add openATTIC team affiliation

Signed-off-by: Tatjana Dehler <tdehler@suse.com>
7 years agoorganizationmap: fix typo
Tatjana Dehler [Wed, 27 Jun 2018 09:09:47 +0000 (11:09 +0200)]
organizationmap: fix typo

Signed-off-by: Tatjana Dehler <tdehler@suse.com>
7 years agogithubmap: update contributors
Tatjana Dehler [Wed, 27 Jun 2018 08:14:24 +0000 (10:14 +0200)]
githubmap: update contributors

Signed-off-by: Tatjana Dehler <tdehler@suse.com>
7 years agogithubmap: cleanup alphabetical order
Tatjana Dehler [Wed, 27 Jun 2018 07:28:15 +0000 (09:28 +0200)]
githubmap: cleanup alphabetical order

Signed-off-by: Tatjana Dehler <tdehler@suse.com>
7 years agodoc: update experimental features - snapshots 22656/head
Jos Collin [Thu, 21 Jun 2018 06:03:41 +0000 (11:33 +0530)]
doc: update experimental features - snapshots

* drop the experimental warning of multi-MDS
* update snapshotting blocked off version
* update Multiple filesystems availability in Jewel

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #22673 from dillaman/wip-24558
Mykola Golub [Wed, 27 Jun 2018 08:40:23 +0000 (11:40 +0300)]
Merge pull request #22673 from dillaman/wip-24558

rbd: basic support for images within namespaces

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #22701 from falcon78921/wip-docs-falcon78921
Kefu Chai [Wed, 27 Jun 2018 05:00:16 +0000 (13:00 +0800)]
Merge pull request #22701 from falcon78921/wip-docs-falcon78921

doc: remove documentation for installing google-perftools on Debian systems

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: link librbd_test against Boost::thread 22710/head
Kefu Chai [Tue, 26 Jun 2018 11:40:35 +0000 (19:40 +0800)]
cmake: link librbd_test against Boost::thread

otherwise we will have:

[ 83%] Building CXX object src/tools/rbd/CMakeFiles/rbd.dir/Utils.cc.o
../../../lib/librbd_test.a(test_ImageWatcher.cc.o): In function
`boost::thread::do_try_join_until(timespec const&)':
/home/kchai/ceph/build/boost/include/boost/thread/detail/thread.hpp:789:
undefined reference to
`boost::thread::do_try_join_until_noexcept(timespec const&, bool&)'
collect2: error: ld returned 1 exit status
src/test/librbd/CMakeFiles/ceph_test_librbd.dir/build.make:137: recipe
for target 'bin/ceph_test_librbd' failed
make[2]: *** [bin/ceph_test_librbd] Error 1

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocommon: add LockPolicy to md_config_t
Kefu Chai [Tue, 26 Jun 2018 07:09:28 +0000 (15:09 +0800)]
common: add LockPolicy to md_config_t

before this change, we guard all read/write access to md_config_t with a
lock. after this change, this policy is optional. and is controled by a
enum named `LockPolicy`. we will use `md_config_impl<LockPolicy::SINGLE>`
to implement the lockless config used by crimson/osd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22418 from wido/mgr-telegraf-generator
Kefu Chai [Wed, 27 Jun 2018 04:24:07 +0000 (12:24 +0800)]
Merge pull request #22418 from wido/mgr-telegraf-generator

mgr/telegraf: Use Python generator and catch OSError

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22434 from wido/zabbix-pgs
Kefu Chai [Wed, 27 Jun 2018 04:22:47 +0000 (12:22 +0800)]
Merge pull request #22434 from wido/zabbix-pgs

mgr/zabbix: Send more PG information to Zabbix

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #22436 from wido/mgr-telegraf-pg-stats
Kefu Chai [Wed, 27 Jun 2018 04:21:46 +0000 (12:21 +0800)]
Merge pull request #22436 from wido/mgr-telegraf-pg-stats

mgr/telegraf: Send more PG status information to Telegraf

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #22556 from majianpeng/bluestore-misc-cleanup2
Kefu Chai [Wed, 27 Jun 2018 04:20:59 +0000 (12:20 +0800)]
Merge pull request #22556 from majianpeng/bluestore-misc-cleanup2

os/bluestore: cleanups

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
7 years agoMerge pull request #22728 from majianpeng/fio-compiler-error
Kefu Chai [Wed, 27 Jun 2018 03:52:24 +0000 (11:52 +0800)]
Merge pull request #22728 from majianpeng/fio-compiler-error

test/fio: fix compiler failure

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agotest/fio: fix compiler error. 22728/head
Jianpeng Ma [Wed, 27 Jun 2018 10:04:44 +0000 (18:04 +0800)]
test/fio: fix compiler error.

Compile  with -DWITH_FIO=ON, met the following bug.
/home/ceph/src/test/fio/fio_ceph_objectstore.cc:148:9: error: ‘unique_ptr’ in namespace ‘ceph’ does not name a template type
   ceph::unique_ptr<std::mutex> lock;
         ^~~~~~~~~~
/home/ceph/src/test/fio/fio_ceph_objectstore.cc: In constructor ‘{anonymous}::Collection::Collection(const spg_t&, ObjectStore::CollectionHandle)’:
/home/ceph/src/test/fio/fio_ceph_objectstore.cc:158:9: error: class ‘{anonymous}::Collection’ does not have any field named ‘lock’
         lock(new std::mutex) {
         ^~~~
/home/ceph/src/test/fio/fio_ceph_objectstore.cc: In function ‘fio_q_status {anonymous}::fio_ceph_os_queue(thread_data*, io_u*)’:
/home/ceph/src/test/fio/fio_ceph_objectstore.cc:604:38: error: ‘struct {anonymous}::Collection’ has no member named ‘lock’
  std::lock_guard<std::mutex> l(*coll.lock);

This bug introduct by commit da5d156b6bdffdd31e4edbadc1cdfc69197bef49.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
7 years agoqa/fs/upgrade/snaps: whitelist inconsistent rstat 22560/head
Yan, Zheng [Wed, 27 Jun 2018 03:11:12 +0000 (11:11 +0800)]
qa/fs/upgrade/snaps: whitelist inconsistent rstat

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
7 years agodoc: updated documentation for installing google-perftools 22701/head
James McClune [Wed, 27 Jun 2018 02:59:48 +0000 (22:59 -0400)]
doc: updated documentation for installing google-perftools

Made updated changes per @tchaikov's request

Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
7 years agotest: When possible show side-by-side diff in addition to regular diff 22727/head
David Zafman [Wed, 27 Jun 2018 01:23:07 +0000 (18:23 -0700)]
test: When possible show side-by-side diff in addition to regular diff

Fixes: https://tracker.ceph.com/issues/21664
Signed-off-by: David Zafman <dzafman@redhat.com>
7 years agoqa/tests - added mimic-p2p suite 22726/head
Yuri Weinstein [Tue, 26 Jun 2018 23:05:44 +0000 (16:05 -0700)]
qa/tests - added mimic-p2p suite

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoqa/workunits/suites/blogbench.sh: use correct dir name 22725/head
Neha Ojha [Tue, 26 Jun 2018 22:30:38 +0000 (18:30 -0400)]
qa/workunits/suites/blogbench.sh: use correct dir name

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoMerge PR #22294 into master
Sage Weil [Tue, 26 Jun 2018 21:57:37 +0000 (16:57 -0500)]
Merge PR #22294 into master

* refs/pull/22294/head:
common/performance: Now hobject_t's hash no longer depends directly on oid.
common/performance: improved hash calculation for hobject_t and ghobject_t

Reviewed-by: Paul Emmerich <paul.emmerich@croit.io>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agogithubmap: update contributors
Sage Weil [Tue, 26 Jun 2018 21:57:36 +0000 (16:57 -0500)]
githubmap: update contributors

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #22696 into master
Sage Weil [Tue, 26 Jun 2018 21:56:49 +0000 (16:56 -0500)]
Merge PR #22696 into master

* refs/pull/22696/head:
mgr/DaemonServer: avoid dereferencing end() iterator

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge PR #21544 into master
Patrick Donnelly [Tue, 26 Jun 2018 21:07:49 +0000 (14:07 -0700)]
Merge PR #21544 into master

* refs/pull/21544/head:
common/config: support to save and re-expand special metavariables

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22580 into master
Patrick Donnelly [Tue, 26 Jun 2018 20:25:35 +0000 (13:25 -0700)]
Merge PR #22580 into master

* refs/pull/22580/head:
mds: improve error handling in PurgeQueue

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge PR #22611 into master
Patrick Donnelly [Tue, 26 Jun 2018 20:25:29 +0000 (13:25 -0700)]
Merge PR #22611 into master

* refs/pull/22611/head:
client: fix use-after-free in Client::link()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agocommon: SharedMutex uses ref-counted implementation 22698/head
Casey Bodley [Wed, 23 May 2018 20:35:42 +0000 (16:35 -0400)]
common: SharedMutex uses ref-counted implementation

add a reference-counted SharedMutexImpl so that lock guards can outlive
the SharedMutex itself. this is required because the lock guards are
passed with async completions, and there is no guarantee that the
executor will process those completions before the SharedMutex
destructs. this case is exercised by the async_destruct unit test

Fixes: http://tracker.ceph.com/issues/24124
Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agoqa: fix symlinks indirectly pointing at qa to .qa 22719/head
Patrick Donnelly [Tue, 26 Jun 2018 18:46:28 +0000 (11:46 -0700)]
qa: fix symlinks indirectly pointing at qa to .qa

Building on the previous commit.

Command used:

$ find suites/ -type l -and -not -name .qa -execdir ~/fix.sh {} \;

fix.sh:
    #!/bin/bash

    link="$(readlink "$1")"

    echo $link
    dirlink="$(dirname "$link")"
    baselink="$(basename "$link")"

    while true; do
        echo $dirlink
        if [ "$dirlink" -ef ~/ceph/qa ]; then
            ln -nsf ".qa/$baselink" "$1"
            exit
        else
            baselink="$(basename "$dirlink")/$baselink"
            dirlink="$(dirname "$dirlink")"
            if [ "$dirlink" -ef . ]; then
                break
            fi
        fi
    done

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa: add .qa helper link
Patrick Donnelly [Tue, 26 Jun 2018 18:33:35 +0000 (11:33 -0700)]
qa: add .qa helper link

This utilizes the recent feature in teuthology [1] to skip hidden files in
suites when building the job matrix.

Idea of this change is to enable referring to the top-level qa directory in a
position-independent way such that copies of a suite to another location do not
break any symlinks.

[1] https://github.com/ceph/teuthology/pull/1185

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #20734 from tchaikov/wip-s-libs-lib
Kefu Chai [Tue, 26 Jun 2018 17:29:56 +0000 (01:29 +0800)]
Merge pull request #20734 from tchaikov/wip-s-libs-lib

test,qa: s/.libs/lib/

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #22690 from tchaikov/wip-no-memory.h
Kefu Chai [Tue, 26 Jun 2018 16:04:16 +0000 (00:04 +0800)]
Merge pull request #22690 from tchaikov/wip-no-memory.h

include/memory.h: remove memory.h

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #22672 from tspmelo/wip-encode-uri
Lenz Grimmer [Tue, 26 Jun 2018 15:03:29 +0000 (17:03 +0200)]
Merge pull request #22672 from tspmelo/wip-encode-uri

mgr/dashboard: Add support for URI encode

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agotest,qa: s/.libs/lib/ 20734/head
Kefu Chai [Tue, 6 Mar 2018 03:08:37 +0000 (11:08 +0800)]
test,qa: s/.libs/lib/

after switching to cmake, the libraries are put in build/lib, instead of
.libs. so point the default settings to ".lib".

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22312 from ZVampirEM77/wip-default-zonegroup-apiname
Casey Bodley [Tue, 26 Jun 2018 13:58:16 +0000 (09:58 -0400)]
Merge pull request #22312 from ZVampirEM77/wip-default-zonegroup-apiname

rgw: fix CreateBucket with BucketLocation parameter failed under default zonegroup

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agomgr/dashboard: Add support for URI encode 22672/head
Tiago Melo [Fri, 22 Jun 2018 14:14:39 +0000 (15:14 +0100)]
mgr/dashboard: Add support for URI encode

Created a decorator and pipe to help encode special URI components in the
frontend.

Modified the backend request handler to decode all the string args.

fixes: http://tracker.ceph.com/issues/24621

Signed-off-by: Tiago Melo <tmelo@suse.com>
7 years agomgr/dashboard: Prettify some frontend files
Tiago Melo [Fri, 22 Jun 2018 14:13:53 +0000 (15:13 +0100)]
mgr/dashboard: Prettify some frontend files

Signed-off-by: Tiago Melo <tmelo@suse.com>
7 years agoMerge pull request #22715 from LenzGr/mgr-dashboard-24623
Lenz Grimmer [Tue, 26 Jun 2018 13:31:23 +0000 (15:31 +0200)]
Merge pull request #22715 from LenzGr/mgr-dashboard-24623

mgr/dashboard: Replaced "Pool" with "Pools" in navigation bar

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #22283 from rjfd/wip-dashboard-user-roles
Lenz Grimmer [Tue, 26 Jun 2018 13:18:12 +0000 (15:18 +0200)]
Merge pull request #22283 from rjfd/wip-dashboard-user-roles

mgr/dashboard: role based authentication/authorization system

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #22663 from joscollin/wip-doc-dashboard
Jos Collin [Tue, 26 Jun 2018 12:21:33 +0000 (17:51 +0530)]
Merge pull request #22663 from joscollin/wip-doc-dashboard

doc: updated get-involved.rst for ceph-dashboard

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
7 years agomgr/dashboard: User permissions control (frontend) 22283/head
Ricardo Marques [Wed, 13 Jun 2018 17:29:30 +0000 (18:29 +0100)]
mgr/dashboard: User permissions control (frontend)

Signed-off-by: Ricardo Marques <rimarques@suse.com>
7 years agomgr/dashboard: controllers: fix endpoint return type when method returns `bytes`
Ricardo Dias [Mon, 25 Jun 2018 09:30:25 +0000 (10:30 +0100)]
mgr/dashboard: controllers: fix endpoint return type when method returns `bytes`

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agomgr/dashboard: controllers: fix controllers endpoints initialization order
Ricardo Dias [Fri, 22 Jun 2018 12:56:34 +0000 (13:56 +0100)]
mgr/dashboard: controllers: fix controllers endpoints initialization order

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agoqa/tasks/mgr/dashboard: test_cluster_conf: restore original value of mon_allow_pool_d...
Ricardo Dias [Fri, 22 Jun 2018 11:04:34 +0000 (12:04 +0100)]
qa/tasks/mgr/dashboard: test_cluster_conf: restore original value of mon_allow_pool_delete

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agomgr/dashboard: hacking.rst: update controller access control instructions
Ricardo Dias [Wed, 6 Jun 2018 14:37:19 +0000 (15:37 +0100)]
mgr/dashboard: hacking.rst: update controller access control instructions

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agodoc/mgr/dashboard: user and role management documentation
Ricardo Dias [Fri, 1 Jun 2018 11:16:27 +0000 (12:16 +0100)]
doc/mgr/dashboard: user and role management documentation

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agomgr/dashboard: auth: return user permissions on login
Ricardo Dias [Fri, 1 Jun 2018 11:15:49 +0000 (12:15 +0100)]
mgr/dashboard: auth: return user permissions on login

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agoqa/tasks/mgr/dashboard: Adapted tests to work with new authentication system
Ricardo Dias [Tue, 24 Apr 2018 16:32:54 +0000 (17:32 +0100)]
qa/tasks/mgr/dashboard: Adapted tests to work with new authentication system

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agomgr/dashboard: configured security info for each controller
Ricardo Dias [Fri, 27 Apr 2018 14:05:21 +0000 (15:05 +0100)]
mgr/dashboard: configured security info for each controller

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agomgr/dashboard: removed `@AuthRequired` decorator
Ricardo Dias [Tue, 24 Apr 2018 12:48:38 +0000 (13:48 +0100)]
mgr/dashboard: removed `@AuthRequired` decorator

Now all controllers require authentication by default.
No disable authentication, a boolean parameter can be passed
in the `@ApiController` decorator.

Fixes: http://tracker.ceph.com/issues/23796
Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agomgr/dashboard: auth: remove single user authentication
Ricardo Dias [Tue, 24 Apr 2018 12:40:19 +0000 (13:40 +0100)]
mgr/dashboard: auth: remove single user authentication

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agomgr/dashboard: pylint: updated list of files to verify
Ricardo Dias [Mon, 23 Apr 2018 11:51:15 +0000 (12:51 +0100)]
mgr/dashboard: pylint: updated list of files to verify

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agomgr/dashboard: tests: local role-based authorization
Ricardo Dias [Sat, 21 Apr 2018 11:55:09 +0000 (12:55 +0100)]
mgr/dashboard: tests: local role-based authorization

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agomgr/dashboard: load and cofigure authorization system
Ricardo Dias [Fri, 20 Apr 2018 15:37:11 +0000 (16:37 +0100)]
mgr/dashboard: load and cofigure authorization system

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agomgr/dashboard: authmanager: authorization handling cherrypy tool
Ricardo Dias [Fri, 27 Apr 2018 13:49:17 +0000 (14:49 +0100)]
mgr/dashboard: authmanager: authorization handling cherrypy tool

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agomgr/dashboard: local role-based authorization system implementation
Ricardo Dias [Fri, 20 Apr 2018 15:36:28 +0000 (16:36 +0100)]
mgr/dashboard: local role-based authorization system implementation

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agomgr/dashboard: security: static scopes and permissions
Ricardo Dias [Fri, 27 Apr 2018 13:48:12 +0000 (14:48 +0100)]
mgr/dashboard: security: static scopes and permissions

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agodoc: updated get-involved.rst for ceph-dashboard 22663/head
Jos Collin [Thu, 21 Jun 2018 14:37:40 +0000 (20:07 +0530)]
doc: updated get-involved.rst for ceph-dashboard

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #22706 from joscollin/wip-doc-dashboardgrafana
Lenz Grimmer [Tue, 26 Jun 2018 10:18:39 +0000 (12:18 +0200)]
Merge pull request #22706 from joscollin/wip-doc-dashboardgrafana

doc/dashboard: fix formatting on Grafana instructions-2

7 years agomgr/dashboard: fix the version of all frontend dependencies 22712/head
Tiago Melo [Tue, 26 Jun 2018 09:37:22 +0000 (10:37 +0100)]
mgr/dashboard: fix the version of all frontend dependencies

This will reduce unexpected errors when building dashboard frontend.

Signed-off-by: Tiago Melo <tmelo@suse.com>
7 years agoinclude/memory.h: remove memory.h 22690/head
Kefu Chai [Tue, 19 Jun 2018 06:30:57 +0000 (14:30 +0800)]
include/memory.h: remove memory.h

memory.h was introduced back when the shared_ptrs were still in TR1, but
we've moved to C++17 now. and the C++ clients should be compiled with
a C++11 compatible compiler. so there is no need to have this file anymore.

also replace all references of ceph::shared_ptr and ceph::weak_ptr with
std::shared_ptr and std::weak_ptr accordingly.

Signed-off-by: Kefu Chai <kchai@redhat.com>