]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoMerge pull request #22065 from ricardoasmarques/wip-table-pagination-style
Lenz Grimmer [Tue, 22 May 2018 12:09:30 +0000 (14:09 +0200)]
Merge pull request #22065 from ricardoasmarques/wip-table-pagination-style

Improve table pagination style

Reviewed-by: Tiago Melo <tmelo@suse.com>
7 years agoMerge pull request #22149 from b-ranto/wip-fix-metadata
Boris Ranto [Tue, 22 May 2018 11:46:06 +0000 (13:46 +0200)]
Merge pull request #22149 from b-ranto/wip-fix-metadata

prometheus: Fix order of occupation values

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
7 years agoMerge pull request #22031 from tspmelo/wip-jest
Lenz Grimmer [Tue, 22 May 2018 10:52:16 +0000 (12:52 +0200)]
Merge pull request #22031 from tspmelo/wip-jest

mgr/dashboard: Add Jest Runner

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
7 years agoMerge pull request #22088 from tspmelo/fix-rbd-task-metadata
Lenz Grimmer [Tue, 22 May 2018 10:51:10 +0000 (12:51 +0200)]
Merge pull request #22088 from tspmelo/fix-rbd-task-metadata

mgr/dashboard: Fix RBD task metadata

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
7 years agoprometheus: Fix order of occupation values 22149/head
Boris Ranto [Tue, 22 May 2018 10:04:20 +0000 (12:04 +0200)]
prometheus: Fix order of occupation values

When we merged the PR to unify the metadata labels, we forgot to switch
the order of hostname and disk in ceph_disk_occupation metric.

Signed-off-by: Boris Ranto <branto@redhat.com>
7 years agoMerge pull request #22069 from tchaikov/wip-mgr-cleanup
Kefu Chai [Tue, 22 May 2018 02:44:36 +0000 (10:44 +0800)]
Merge pull request #22069 from tchaikov/wip-mgr-cleanup

mgr: fix typo in variable name and cleanups

Reveiwed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #22077 from majianpeng/config-w/o-mgr
Kefu Chai [Tue, 22 May 2018 02:43:10 +0000 (10:43 +0800)]
Merge pull request #22077 from majianpeng/config-w/o-mgr

cmake: make -DWITH_MGR=OFF work.

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22089 from jcsp/wip-24175
Kefu Chai [Tue, 22 May 2018 02:42:04 +0000 (10:42 +0800)]
Merge pull request #22089 from jcsp/wip-24175

mgr/status: output to stdout, not stderr

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22074 from dzafman/wip-parens
Josh Durgin [Mon, 21 May 2018 22:54:05 +0000 (15:54 -0700)]
Merge pull request #22074 from dzafman/wip-parens

test: Need to escape parens in log-whitelist for grep

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #22096 from yuriw/wip-yuriw-crontab
Josh Durgin [Mon, 21 May 2018 22:27:39 +0000 (15:27 -0700)]
Merge pull request #22096 from yuriw/wip-yuriw-crontab

qa/tests: added filters to support distro tests for client-upgrade tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoqa/tests - reverted clients upgrades for luminous runs 22096/head
Yuri Weinstein [Fri, 18 May 2018 23:01:29 +0000 (16:01 -0700)]
qa/tests - reverted clients upgrades for luminous runs
removed ~/rhel_only_on_ovh.yaml to be able to run on ovh
forced runs on smithi only

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoMerge pull request #22036 from linuxbox2/wip-warn-orphans
Matt Benjamin [Mon, 21 May 2018 17:55:58 +0000 (13:55 -0400)]
Merge pull request #22036 from linuxbox2/wip-warn-orphans

rgw: require --yes-i-really-mean-it to run radosgw-admin orphans find

7 years agotest: Add CACHE_POOL_NO_HIT_SET to whitelist for mon/pool_ops.sh 22074/head
David Zafman [Sat, 19 May 2018 03:15:41 +0000 (20:15 -0700)]
test: Add CACHE_POOL_NO_HIT_SET to whitelist for mon/pool_ops.sh

Ignore
  cluster [WRN] Health check failed: 1 cache pools are missing hit_sets (CACHE_POOL_NO_HIT_SET)

Signed-off-by: David Zafman <dzafman@redhat.com>
7 years agotest: Need to escape parens in log-whitelist for grep
David Zafman [Fri, 18 May 2018 00:30:32 +0000 (17:30 -0700)]
test: Need to escape parens in log-whitelist for grep

Signed-off-by: David Zafman <dzafman@redhat.com>
7 years agoMerge PR #22064 into master
Sage Weil [Mon, 21 May 2018 16:31:54 +0000 (11:31 -0500)]
Merge PR #22064 into master

* refs/pull/22064/head:
os/bluestore: fix signed/unsigned mismatch warning during building

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge PR #22091 into master
Sage Weil [Mon, 21 May 2018 13:41:00 +0000 (08:41 -0500)]
Merge PR #22091 into master

* refs/pull/22091/head:
crush: update choose_args on bucket removal
crush: update choose_args on bucket removal, resize, or position mismatch
crush: create weight-set on demand when doing a choose-args reweight
test/cli/crushtool: use straw2 buckets for choose-args test
crush: weight_set_size -> weight_set_positions

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge PR #21540 into wip-sage-testing-20180521.120735
Sage Weil [Mon, 21 May 2018 12:07:59 +0000 (07:07 -0500)]
Merge PR #21540 into wip-sage-testing-20180521.120735

* refs/pull/21540/head:
tests/crypto: print compile warning when NSS is unavailable.
tests/crypto: add tests for the no-bl encrypt/decrypt, part 2.
tests/crypto: add tests for the no-bl encrypt/decrypt.
auth: use OpenSSL for CryptoAESKeyHandler's no-bl encrypt/decrypt.
auth: extend CryptoKey with no-bl encrypt/decrypt.
auth: CryptoAESKeyHandler switches from NSS to OpenSSL.
auth: the outbuf of AES should be multiple of block size
auth: cache the PK11Context for CryptoAESKeyHandler

7 years agoMerge PR #21973 into wip-sage-testing-20180521.120735
Sage Weil [Mon, 21 May 2018 12:07:53 +0000 (07:07 -0500)]
Merge PR #21973 into wip-sage-testing-20180521.120735

* refs/pull/21973/head:
pybind/ceph_argparse.py: show usage on fully matched cmd

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge PR #21985 into wip-sage-testing-20180521.120735
Sage Weil [Mon, 21 May 2018 12:07:48 +0000 (07:07 -0500)]
Merge PR #21985 into wip-sage-testing-20180521.120735

* refs/pull/21985/head:
common: partially revert 95fc248 to make get_process_name work

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge PR #21994 into wip-sage-testing-20180521.120735
Sage Weil [Mon, 21 May 2018 12:07:44 +0000 (07:07 -0500)]
Merge PR #21994 into wip-sage-testing-20180521.120735

* refs/pull/21994/head:
os/bluefs/BlueFS: cleanup code.

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #22103 from tchaikov/wip-qa-test_envlibrados_for_rocksdb
Kefu Chai [Mon, 21 May 2018 11:36:57 +0000 (19:36 +0800)]
Merge pull request #22103 from tchaikov/wip-qa-test_envlibrados_for_rocksdb

qa/workunits/rados/test_envlibrados_for_rocksdb: install g++ not g++-4.7

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agocmake: make -DWITH_MGR=OFF work. 22077/head
Jianpeng Ma [Mon, 21 May 2018 09:55:13 +0000 (17:55 +0800)]
cmake: make -DWITH_MGR=OFF work.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
7 years agoMerge pull request #22084 from liewegas/wip-fix-fop
Kefu Chai [Mon, 21 May 2018 08:40:41 +0000 (16:40 +0800)]
Merge pull request #22084 from liewegas/wip-fix-fop

osd/PrimaryLogPG: fix try_flush_mark_clean write contention case

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22072 from dillaman/wip-24165
Mykola Golub [Mon, 21 May 2018 07:00:15 +0000 (10:00 +0300)]
Merge pull request #22072 from dillaman/wip-24165

librbd: prevent the use of internal feature bits from external users

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agobuffer.h: avoid using c++14 features 22103/head
Kefu Chai [Sun, 20 May 2018 11:54:00 +0000 (19:54 +0800)]
buffer.h: avoid using c++14 features

so we dont't need to force librados client to move to C++14 or up.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoqa/workunits/rados/test_envlibrados_for_rocksdb: use cmake not make
Kefu Chai [Sun, 20 May 2018 08:52:53 +0000 (16:52 +0800)]
qa/workunits/rados/test_envlibrados_for_rocksdb: use cmake not make

* so we just rely on a single build system instead of two of them, the
  other place we use cmake is cmake/modules/BuildRockDB.cmake.
* disable gflags when building rocksdb, it's optional and does not help
  in the sense of testing librados support.
* disable prompts when installing on debian, to silence warnings like:
  debconf: unable to initialize frontend: Dialog
* drop --force-yes option, as it is deprecated, and is replaced with
  --allow-downgrades, --allow-remove-essential,
  --allow-change-held-packages,  but none of them apply in our case.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21982 from tchaikov/mgr-brag
Sage Weil [Mon, 21 May 2018 02:34:12 +0000 (21:34 -0500)]
Merge pull request #21982 from tchaikov/mgr-brag

mgr/telemetry: Add Ceph Telemetry module to send reports back to project

7 years agoMerge PR #21847 into wip-sage-testing-20180521.023125
Sage Weil [Mon, 21 May 2018 02:31:34 +0000 (21:31 -0500)]
Merge PR #21847 into wip-sage-testing-20180521.023125

* refs/pull/21847/head:
log: disk write coalescing

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #22063 from liewegas/wip-unit-spaces
Sage Weil [Mon, 21 May 2018 02:26:03 +0000 (21:26 -0500)]
Merge pull request #22063 from liewegas/wip-unit-spaces

include/types: space between number and units

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
7 years agoMerge pull request #22042 from liewegas/wip-rm-pool-race
Sage Weil [Mon, 21 May 2018 02:24:37 +0000 (21:24 -0500)]
Merge pull request #22042 from liewegas/wip-rm-pool-race

ceph_test_rados_api_misc: remove obsolete LibRadosMiscPool.PoolCreationRace

Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoMerge pull request #22106 from liewegas/wip-rados-distros
Sage Weil [Mon, 21 May 2018 02:23:48 +0000 (21:23 -0500)]
Merge pull request #22106 from liewegas/wip-rados-distros

qa/suites/rados/thrash-old-clients: only centos and 16.04

7 years agoMerge PR #21997 into master
Patrick Donnelly [Sun, 20 May 2018 23:52:40 +0000 (16:52 -0700)]
Merge PR #21997 into master

* refs/pull/21997/head:
mds: broadcast quota to relevant clients when quota is explicitly set

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge PR #22001 into master
Patrick Donnelly [Sun, 20 May 2018 23:52:35 +0000 (16:52 -0700)]
Merge PR #22001 into master

* refs/pull/22001/head:
client: avoid freeing inode when it contains TX buffer heads

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22023 into master
Patrick Donnelly [Sun, 20 May 2018 23:52:30 +0000 (16:52 -0700)]
Merge PR #22023 into master

* refs/pull/22023/head:
messages: print quota info in MClientQuota msg

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22045 into master
Patrick Donnelly [Sun, 20 May 2018 23:52:25 +0000 (16:52 -0700)]
Merge PR #22045 into master

* refs/pull/22045/head:
client: cleanup Cap init

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #22080 into master
Patrick Donnelly [Sun, 20 May 2018 23:52:20 +0000 (16:52 -0700)]
Merge PR #22080 into master

* refs/pull/22080/head:
client: fix issue of revoking non-auth caps

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agocrush: update choose_args on bucket removal 22091/head
Sage Weil [Fri, 18 May 2018 18:11:57 +0000 (13:11 -0500)]
crush: update choose_args on bucket removal

The specific bug I see is that a bucket no longer exists but its
choose_args still does.  However, I'm also taking the opportunity to
verify that the choose_args agrees with the bucket sizes and position
counts everywhere else, too.  Check for

- ids or weight_sets for buckets that don't exist or aren't straw2
- weight_set_positions that don't match the choose_args
  - don't fix this, just warn.  i'm not sure how it would happen.  :/
- weight_set sizes that don't match the bucket size

Fixes: http://tracker.ceph.com/issues/24167
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/suites/rados/thrash-old-clients: only centos and 16.04 22106/head
Sage Weil [Sun, 20 May 2018 14:38:02 +0000 (09:38 -0500)]
qa/suites/rados/thrash-old-clients: only centos and 16.04

We don't have old client builds for the newer distros.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21961 from ceph/wip-cd-ovh-vol
Kefu Chai [Sun, 20 May 2018 10:35:35 +0000 (18:35 +0800)]
Merge pull request #21961 from ceph/wip-cd-ovh-vol

qa/tests: fix volume size when running in ovh

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22098 from liewegas/wip-24180
Kefu Chai [Sun, 20 May 2018 09:40:17 +0000 (17:40 +0800)]
Merge pull request #22098 from liewegas/wip-24180

mon/LogMonitor: call no_reply() on ignored log message

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoqa/workunits/rados/test_envlibrados_for_rocksdb: install g++ not g++-4.7
Kefu Chai [Sun, 20 May 2018 08:29:49 +0000 (16:29 +0800)]
qa/workunits/rados/test_envlibrados_for_rocksdb: install g++ not g++-4.7

since fog now deploys ubuntu 18.04 where g++-4.7 is not available
anymore, so g++ is good enough.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22092 from liewegas/wip-mimic-upgrades
Sage Weil [Sat, 19 May 2018 17:34:52 +0000 (12:34 -0500)]
Merge pull request #22092 from liewegas/wip-mimic-upgrades

qa/suites/upgrade/luminous-x: a few fixes

7 years agoMerge pull request #21941 from ukernel/wip-24053
Yan, Zheng [Sat, 19 May 2018 09:07:40 +0000 (17:07 +0800)]
Merge pull request #21941 from ukernel/wip-24053

mds: reply session reject for open request from blacklisted client

7 years agoqa/tasks/cephfs: add timeout parameter to kclient umount_wait 21941/head
Yan, Zheng [Fri, 11 May 2018 12:26:43 +0000 (20:26 +0800)]
qa/tasks/cephfs: add timeout parameter to kclient umount_wait

Just make caller happy. there is no easy way to support timeout.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
Fixes: https://tracker.ceph.com/issues/24053
7 years agomds: reply session reject for open request from blacklisted client
Yan, Zheng [Fri, 11 May 2018 06:55:12 +0000 (14:55 +0800)]
mds: reply session reject for open request from blacklisted client

Kernel client and old version libcephfs do not check if themselves
are blacklisted. They can be stuck at opening session after getting
blacklisted. The session reject message can avoid this.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: https://tracker.ceph.com/issues/24054
7 years agoclient: fix issue of revoking non-auth caps 22080/head
Yan, Zheng [Fri, 18 May 2018 06:26:32 +0000 (14:26 +0800)]
client: fix issue of revoking non-auth caps

when non-auth mds revokes caps, Fcb caps can still be issued by auth
auth mds. It's wrong to flush buffer or invalidate cache when non-auth
mds revokes other caps. This bug can cause client to not respond the
revoke.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: https://tracker.ceph.com/issues/24172
7 years agoMerge PR #22073 into master
Patrick Donnelly [Sat, 19 May 2018 04:36:50 +0000 (21:36 -0700)]
Merge PR #22073 into master

* refs/pull/22073/head:
client: delay dentry trimming until after cap traversal
qa: test for trim_caps segfault for trimmed dentries

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoclient: delay dentry trimming until after cap traversal 22073/head
Patrick Donnelly [Fri, 18 May 2018 00:06:52 +0000 (17:06 -0700)]
client: delay dentry trimming until after cap traversal

Fixes: http://tracker.ceph.com/issues/24137
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa: test for trim_caps segfault for trimmed dentries
Patrick Donnelly [Fri, 18 May 2018 02:36:42 +0000 (19:36 -0700)]
qa: test for trim_caps segfault for trimmed dentries

Test case by Yan Zheng [1].

[1] http://tracker.ceph.com/issues/24137#note-6

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa/tests: Removed kraken tests
Yuri Weinstein [Fri, 18 May 2018 22:57:10 +0000 (15:57 -0700)]
qa/tests:  Removed kraken tests

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoqa/tests: Removed hammer client tests
Yuri Weinstein [Fri, 18 May 2018 22:18:09 +0000 (15:18 -0700)]
qa/tests: Removed hammer client tests

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agocrush: update choose_args on bucket removal, resize, or position mismatch
Sage Weil [Fri, 18 May 2018 18:11:57 +0000 (13:11 -0500)]
crush: update choose_args on bucket removal, resize, or position mismatch

The specific bug I see is that a bucket no longer exists but its
choose_args still does.  However, I'm also taking the opportunity to
verify that the choose_args agrees with the bucket sizes and position
counts everywhere else, too.  Check for

- ids or weight_sets for buckets that don't exist or aren't straw2
- weight_set_positions that don't match the choose_args
- weight_set sizes that don't match the bucket size

Fixes: http://tracker.ceph.com/issues/24167
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agocrush: create weight-set on demand when doing a choose-args reweight
Sage Weil [Fri, 18 May 2018 22:10:14 +0000 (17:10 -0500)]
crush: create weight-set on demand when doing a choose-args reweight

If we try to reweight an item in a choose-args set for a given item
but the bucket doesn't have a weight_set yet, create it on the fly, and
populate it with the canonical bucket weights.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agotest/cli/crushtool: use straw2 buckets for choose-args test
Sage Weil [Fri, 18 May 2018 22:10:47 +0000 (17:10 -0500)]
test/cli/crushtool: use straw2 buckets for choose-args test

Choose-args only works for straw2 so it is misleading to test using a
map with straw buckets.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/tests: added filters to support distro tests for upgrade/client-upgrade-* tests
Yuri Weinstein [Fri, 18 May 2018 20:18:33 +0000 (13:18 -0700)]
qa/tests: added filters to support distro tests for upgrade/client-upgrade-* tests

ref:
https://github.com/ceph/ceph/pull/22087
https://github.com/ceph/ceph/pull/22090
https://github.com/ceph/ceph/pull/22094
https://github.com/ceph/ceph/pull/22095

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoMerge PR #21548 into master
Patrick Donnelly [Fri, 18 May 2018 21:31:18 +0000 (14:31 -0700)]
Merge PR #21548 into master

* refs/pull/21548/head:
osdc/Objecter: apply throttle on enumerate_objects.

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge PR #21963 into master
Patrick Donnelly [Fri, 18 May 2018 21:31:11 +0000 (14:31 -0700)]
Merge PR #21963 into master

* refs/pull/21963/head:
mds: properly setup client_need_snapflush for snap inode
Revert "mds: properly setup need_snapflush for snapped inode"

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #21972 into master
Patrick Donnelly [Fri, 18 May 2018 21:31:03 +0000 (14:31 -0700)]
Merge PR #21972 into master

* refs/pull/21972/head:
client: increase verbosity level for log messages in helper methods

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #22066 from liewegas/wip-pgmap-digest-decode
Sage Weil [Fri, 18 May 2018 20:53:20 +0000 (15:53 -0500)]
Merge pull request #22066 from liewegas/wip-pgmap-digest-decode

mon/PGMap: fix PGMapDigest decode

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agomon/LogMonitor: call no_reply() on ignored log message 22098/head
Sage Weil [Fri, 18 May 2018 20:44:09 +0000 (15:44 -0500)]
mon/LogMonitor: call no_reply() on ignored log message

If we're dropping it on the floor, we need to tell the mon that, so that
it can tell the forwarding mon to discard its state.

Fixes: https://tracker.ceph.com/issues/24180
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/suites/thrashosds-health: whitelist REQUEST_SLOW 22092/head
Sage Weil [Fri, 18 May 2018 19:01:33 +0000 (14:01 -0500)]
qa/suites/thrashosds-health: whitelist REQUEST_SLOW

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/suites/upgrade/luminous-x: whitelist SLOW_OPS
Sage Weil [Fri, 18 May 2018 19:01:19 +0000 (14:01 -0500)]
qa/suites/upgrade/luminous-x: whitelist SLOW_OPS

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/suites/upgrade/luminous-x: more cinder volumes
Sage Weil [Fri, 18 May 2018 19:01:01 +0000 (14:01 -0500)]
qa/suites/upgrade/luminous-x: more cinder volumes

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/workunits/cephtool/test.sh: update unit formatting 22063/head
Sage Weil [Fri, 18 May 2018 18:53:04 +0000 (13:53 -0500)]
qa/workunits/cephtool/test.sh: update unit formatting

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #22040 from alfredodeza/wip-rm24147
Alfredo Deza [Fri, 18 May 2018 17:36:07 +0000 (13:36 -0400)]
Merge pull request #22040 from alfredodeza/wip-rm24147

common/options: add description of osd objectstore backends

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Nathan Cutler <cutler@suse.cz>
7 years agocrush: weight_set_size -> weight_set_positions
Sage Weil [Fri, 18 May 2018 17:30:21 +0000 (12:30 -0500)]
crush: weight_set_size -> weight_set_positions

This naming was confusing!  This is the number of positions we
have weight_sets for.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/bluestore: fix signed/unsigned mismatch warning during building 22064/head
Igor Fedotov [Thu, 17 May 2018 15:05:37 +0000 (18:05 +0300)]
os/bluestore: fix signed/unsigned mismatch warning during building

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
7 years agomgr/status: output to stdout, not stderr 22089/head
John Spray [Fri, 18 May 2018 15:44:34 +0000 (16:44 +0100)]
mgr/status: output to stdout, not stderr

I think this was just me forgetting the order
of the arguments when writing the return statements.

Fixes: http://tracker.ceph.com/issues/24175
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr/dashboard: Fix RBD task metadata 22088/head
Tiago Melo [Fri, 18 May 2018 15:08:37 +0000 (16:08 +0100)]
mgr/dashboard: Fix RBD task metadata

Error message template for RBD copy was trying to read
an unexistent property of the returned metada.

Metadata for RBD edit was missing the new image name.
The new name should be displayed, instead of the old one,
when the user tries to use an existent image name.

Fixes: https://tracker.ceph.com/issues/24171
Signed-off-by: Tiago Melo <tmelo@suse.com>
7 years agotests/crypto: print compile warning when NSS is unavailable. 21540/head
Radoslaw Zarzynski [Thu, 17 May 2018 15:57:32 +0000 (11:57 -0400)]
tests/crypto: print compile warning when NSS is unavailable.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agotests/crypto: add tests for the no-bl encrypt/decrypt, part 2.
Radoslaw Zarzynski [Tue, 8 May 2018 13:08:55 +0000 (15:08 +0200)]
tests/crypto: add tests for the no-bl encrypt/decrypt, part 2.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agotests/crypto: add tests for the no-bl encrypt/decrypt.
Radoslaw Zarzynski [Fri, 27 Apr 2018 18:01:26 +0000 (20:01 +0200)]
tests/crypto: add tests for the no-bl encrypt/decrypt.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoauth: use OpenSSL for CryptoAESKeyHandler's no-bl encrypt/decrypt.
Radoslaw Zarzynski [Fri, 27 Apr 2018 14:01:56 +0000 (16:01 +0200)]
auth: use OpenSSL for CryptoAESKeyHandler's no-bl encrypt/decrypt.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoauth: extend CryptoKey with no-bl encrypt/decrypt.
Radoslaw Zarzynski [Thu, 19 Apr 2018 23:43:57 +0000 (01:43 +0200)]
auth: extend CryptoKey with no-bl encrypt/decrypt.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoauth: CryptoAESKeyHandler switches from NSS to OpenSSL.
Radoslaw Zarzynski [Thu, 26 Apr 2018 13:35:20 +0000 (15:35 +0200)]
auth: CryptoAESKeyHandler switches from NSS to OpenSSL.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoauth: the outbuf of AES should be multiple of block size
Kefu Chai [Tue, 3 Apr 2018 09:16:30 +0000 (17:16 +0800)]
auth: the outbuf of AES should be multiple of block size

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 3cfcd02af6381022081d51367f7338bde1fcb1d2)

7 years agoauth: cache the PK11Context for CryptoAESKeyHandler
Kefu Chai [Wed, 25 Apr 2018 15:21:54 +0000 (17:21 +0200)]
auth: cache the PK11Context for CryptoAESKeyHandler

in the flame graph, 0.50% of total time is used by
CephxSessionHandler::check_message_signature(), in which 0.27% is used
by PK11_CreateContextBySymKey(). so we should cache the PK11Context.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit f8c2036f7663be54030e13f1f9c1511cb40070f6)

7 years agocls/rbd: prevent creating image with internal feature bits enabled 22072/head
Jason Dillaman [Thu, 17 May 2018 17:11:09 +0000 (13:11 -0400)]
cls/rbd: prevent creating image with internal feature bits enabled

Fixes: http://tracker.ceph.com/issues/24165
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agotest/librbd: fsx should use the default image features
Jason Dillaman [Thu, 17 May 2018 18:12:27 +0000 (14:12 -0400)]
test/librbd: fsx should use the default image features

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: prevent creation of images with internal feature bits
Jason Dillaman [Thu, 17 May 2018 17:52:04 +0000 (13:52 -0400)]
librbd: prevent creation of images with internal feature bits

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoosd/PrimaryLogPG: fix try_flush_mark_clean write contention case 22084/head
Sage Weil [Fri, 18 May 2018 14:24:48 +0000 (09:24 -0500)]
osd/PrimaryLogPG: fix try_flush_mark_clean write contention case

Release ctx *after* we dereference it to queue up the other flush waiters.
This was a dumb mistake in the recent fix from 41609ba1b24e5384494c7959494e19302b5a2429

Fixes: http://tracker.ceph.com/issues/24174
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agorbd-mirror: mask off implicitly enabled feature bits for new images
Jason Dillaman [Thu, 17 May 2018 17:46:18 +0000 (13:46 -0400)]
rbd-mirror: mask off implicitly enabled feature bits for new images

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: re-use image create option logic for clones
Jason Dillaman [Thu, 17 May 2018 17:18:15 +0000 (13:18 -0400)]
rbd-mirror: re-use image create option logic for clones

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #22078 from tchaikov/wip-cls-rbd-fix-FTBFS
Jason Dillaman [Fri, 18 May 2018 11:22:13 +0000 (07:22 -0400)]
Merge pull request #22078 from tchaikov/wip-cls-rbd-fix-FTBFS

cls/rbd: fix build

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agocls/rbd: fix build 22078/head
Kefu Chai [Fri, 18 May 2018 10:16:00 +0000 (18:16 +0800)]
cls/rbd: fix build

3cbe0ced was merged after d03ff14, so update accordingly.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21915 from dillaman/wip-rbd-mirror-policy
Mykola Golub [Fri, 18 May 2018 07:32:49 +0000 (10:32 +0300)]
Merge pull request #21915 from dillaman/wip-rbd-mirror-policy

rbd-mirror: optionally support active/active replication

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #21651 from ceph/wip-da-dmclock-submodule
Josh Durgin [Thu, 17 May 2018 20:57:39 +0000 (13:57 -0700)]
Merge pull request #21651 from ceph/wip-da-dmclock-submodule

move dmclock subtree into submodule

Reviewed-by: Eric Ivancich <ivancich@redhat.com>
7 years agomgr/dashboard: Use Jest in package.json scripts 22031/head
Tiago Melo [Thu, 17 May 2018 17:08:51 +0000 (18:08 +0100)]
mgr/dashboard: Use Jest in package.json scripts

Signed-off-by: Tiago Melo <tmelo@suse.com>
7 years agoMerge pull request #22015 from tchaikov/wip-denc
Kefu Chai [Thu, 17 May 2018 16:56:08 +0000 (00:56 +0800)]
Merge pull request #22015 from tchaikov/wip-denc

buffer,denc: use ptr::const_iterator for decode

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agomgr/dashboard: Adapt unit tests to Jest
Tiago Melo [Wed, 16 May 2018 10:38:02 +0000 (11:38 +0100)]
mgr/dashboard: Adapt unit tests to Jest

Signed-off-by: Tiago Melo <tmelo@suse.com>
7 years agomgr/dashboard: Add Jest Runner
Tiago Melo [Wed, 16 May 2018 10:31:31 +0000 (11:31 +0100)]
mgr/dashboard: Add Jest Runner

Signed-off-by: Tiago Melo <tmelo@suse.com>
7 years agoMerge pull request #22059 from LenzGr/mgr-dashboard-documentation
Sage Weil [Thu, 17 May 2018 16:40:20 +0000 (11:40 -0500)]
Merge pull request #22059 from LenzGr/mgr-dashboard-documentation

doc: Updated dashboard documentation (features, SSL config)

Reviewed-by: Wido den Hollander <wido@42on.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agomgr: fix typo in variable name and cleanups 22069/head
Kefu Chai [Thu, 17 May 2018 16:36:41 +0000 (00:36 +0800)]
mgr: fix typo in variable name and cleanups

* s/sercive/service/
* also fix the logging message. before this change, we have

send_report send_report osd,2.0x557ea1c16550 sent me an unknown health
metric:

after this change,

send_report send_report osd.2 sent me an unknown health metric: 0x01

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoqa/workunits/rbd/import_export: update unit formatting
Sage Weil [Thu, 17 May 2018 16:14:13 +0000 (11:14 -0500)]
qa/workunits/rbd/import_export: update unit formatting

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/workunits/rbd/cli_generic: update unit formatting
Sage Weil [Thu, 17 May 2018 16:13:31 +0000 (11:13 -0500)]
qa/workunits/rbd/cli_generic: update unit formatting

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agotest/cli-integration/rbd: update unit formatting
Sage Weil [Thu, 17 May 2018 16:12:44 +0000 (11:12 -0500)]
test/cli-integration/rbd: update unit formatting

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoinclude/types: space between number and units
Sage Weil [Thu, 17 May 2018 15:04:18 +0000 (10:04 -0500)]
include/types: space between number and units

not

    client:   504B/s rd, 10.6MiB/s wr, 0op/s rd, 30op/s wr

but

    client:   504 B/s rd, 10.6 MiB/s wr, 0 op/s rd, 30 op/s wr

This was changed as part of d3cecebacdcebcf475808a6204de22dfa94d729d.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomon/PGMap: fix PGMapDigest decode 22066/head
Sage Weil [Thu, 17 May 2018 15:51:46 +0000 (10:51 -0500)]
mon/PGMap: fix PGMapDigest decode

The compat path wasn't clearing the map before filling in new entries.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #22061 from tspmelo/wip-npmrc
Lenz Grimmer [Thu, 17 May 2018 15:44:59 +0000 (17:44 +0200)]
Merge pull request #22061 from tspmelo/wip-npmrc

mgr/dashboard: Disable package-lock.json creation

Reviewed-by: Ricardo Marques <rimarques@suse.com>
7 years agodoc: Updated dashboard documentation (features, SSL config) 22059/head
Lenz Grimmer [Thu, 17 May 2018 15:34:36 +0000 (17:34 +0200)]
doc: Updated dashboard documentation (features, SSL config)

Updated Ceph manager dashboard documentation: added SSL to the
feature overview, added new section about configuring SSL certificates.
Rearranged installation instructions for setting host name and port.

Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>