Commit Graph

1873 Commits

Author SHA1 Message Date
John Spray
967fc9cf8a
Merge pull request #18649 from b-ranto/wip-restful-fixes
mgr/restful: A couple of restful fixes

Reviewed-by: John Spray <john.spray@redhat.com>
2017-11-29 12:11:58 +00:00
Kefu Chai
b3c159e9fb qa/ceph-disk: enlarge the simulated SCSI disk
100MB will be allocated for journal, and the remaining 100MB is for data
device. taking the inode into consideration, there will be approximately
87988 kB available for the activated OSD. and it will complain with a
"nearfull" state.

Fixes: http://tracker.ceph.com/issues/22136
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-28 14:55:33 +08:00
Kefu Chai
aa34321a4a qa/workunits/ceph-disk: do not redirect stderr to stdout
normally, if we care about the output of ceph-disk, we expect a json
string, and ceph-disk sends the output to stdout, and errors/warnings
to stderr. so everything works as expected. and the test should also
follow this tradition. for example, if deprecated warnings are printed,
the warning message should not be collected along with the json string.

see also: d44334f3

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-28 14:55:19 +08:00
Boris Ranto
059588e758 qa/restful: Test pg_num/pgp_num modifications
Signed-off-by: Boris Ranto <branto@redhat.com>
2017-11-27 14:35:26 +01:00
Mykola Golub
7fb9920316 qa/workunits/rbd: wait for status propagated only if daemon started
Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
2017-11-21 22:29:16 +02:00
Jason Dillaman
0502cb1573
Merge pull request #19073 from trociny/wip-qa-demote
qa/workunits/rbd: wait for demote status is propagated

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-11-21 12:52:08 -05:00
Kefu Chai
d44334f317 qa/workunits: silence py warnings for ceph-disk tests
ceph-disk now prints "depreacted" warning message when it starts. but
the tests parses its stdout and stderr for a json string. so we need to
silence the warnings for the tests.

Fixes: http://tracker.ceph.com/issues/22154
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-21 21:49:48 +08:00
Mykola Golub
f4b88b2c9d qa/workunits/rbd: wait for demote status is propagated
(before promoting the image on another cluster)

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
2017-11-21 13:22:50 +02:00
Ilya Dryomov
c1d6f8364f
Merge pull request #18652 from idryomov/wip-qa-krbd-blkroset
qa/suites/krbd: add krbd BLKROSET test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-11-02 10:10:39 +01:00
Jason Dillaman
540b4cf575
Merge pull request #18619 from trociny/wip-qa-mirror-remove
qa/workunits/rbd: unnecessary sleep after failed remove

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-11-01 21:34:35 -04:00
Yuri Weinstein
223f45e4e1
Merge pull request #18610 from cbodley/wip-osd-subop-num
osd: add processed_subop_count for cls_cxx_subop_version()

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-11-01 08:24:13 -07:00
Kefu Chai
371d3f4091 qa: stop testing deprecated "ceph osd create"
"ceph osd create" is not idempotent, and is considered deprecated.

Fixes: http://tracker.ceph.com/issues/21993
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-01 10:45:11 +08:00
Ilya Dryomov
c4888ddc1f qa/workunits/rbd: remove set_ro.py
This test is incomplete and has been obsoleted by krbd_blkroset.t.
It's also not wired up, so it's not actually being run.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2017-10-31 13:40:16 +01:00
Casey Bodley
83d6b493f7 qa: add ceph_test_cls_log to cls workunit
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-10-30 15:31:03 -04:00
Mykola Golub
cb90069604 qa/workunits/rbd: unnecessary sleep after failed remove
Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
2017-10-30 08:57:29 +02:00
Jason Dillaman
27613a63d1 qa/suites/rbd: run cls tests for all dependencies
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-10-27 15:23:45 -04:00
Sage Weil
7740af808c Merge pull request #18552 from liewegas/wip-mds-cluster-down
qa/workunits/rest/test.py: stop trying to test obsolte cluster_up/down

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-26 17:47:51 -05:00
Sage Weil
810a138133 qa/workunits/rest/test.py: stop trying to test obsolete 'mds *' commands
These were recently removed.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-26 11:22:20 -05:00
Sage Weil
c337b8739d Merge pull request #18533 from tchaikov/wip-qa-cephtool
qa: do not "ceph fs get cephfs" w/o a cephfs fs

Reviewed-by: Douglas Fuller <dfuller@redhat.com>
2017-10-26 09:19:11 -05:00
Kefu Chai
3ceab4ca43 Merge pull request #16332 from badone/wip-warn-about-objects-with-too-many-omap-entries
osd: Warn about objects with too many omap entries

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-25 19:20:00 +08:00
Kefu Chai
0f1e97238c qa: do not "ceph fs get cephfs" w/o a cephfs fs
introduced by 183646c

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-25 19:12:39 +08:00
Patrick Donnelly
c58161f25b
Merge PR #17266 into master
* refs/pull/17266/head:
	qa: update test_ceph_argparse to test fs cmds
	qa: use fs rm_data_pool
	qa: fix mdsmap lookup
	qa: remove usage of mds dump
	PendingReleaseNotes: add obsoleted mds commands
	qa: remove use of obsolete mds commands
	ceph_volume_client: remove use of obsolete mds cmd
	doc: update on obsolete mds commands
	cephfs: obsolete deprecated mds commands

Reviewed-by: Douglas Fuller <dfuller@redhat.com>
2017-10-24 16:37:14 -07:00
Patrick Donnelly
b897ef9445
qa: use fs rm_data_pool
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-24 11:51:02 -07:00
Brad Hubbard
71bf04775b osd: Warn about objects with too many omap entries
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2017-10-24 17:27:57 +10:00
Jason Dillaman
918df91213 rbd: bench should flush prior to starting a test
For the new read-based bench tests, flushing prior to the start of the test
will result in the exclusive lock being acquired and the object map being
utilized.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-10-23 13:22:50 -04:00
Kefu Chai
9911e905e4 Merge pull request #16745 from Liuchang0812/object-store-repair
common, tool: update kvstore-tool to repair key/value database

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-18 00:24:39 +08:00
Jason Dillaman
ecec3217b6 Merge pull request #17134 from PCzhangPC/metaexin
rbd: export/import image-meta when we export/import an image

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-10-16 21:00:08 -04:00
Chang Liu
8d5d9c6a62 test: new test case for ceph-kvstore-tool
Signed-off-by: Chang Liu <liuchang0812@gmail.com>
2017-10-16 22:52:10 +08:00
Jason Dillaman
22816ed3f4 qa/workunits/rbd: fixed variable name for resync image id
Fixes: http://tracker.ceph.com/issues/21663
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-10-03 13:25:33 -04:00
Patrick Donnelly
183646c919
qa: remove use of obsolete mds commands
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-01 17:22:36 -07:00
Mykola Golub
fcaffe7e01 qa/workunits/rbd: pool create may fail for small cluster
ceph osd pool create test 100
Error ERANGE:  pg_num 100 size 3 would mean 648 total pgs, which exceeds max 600 (mon_max_pg_per_osd 200 * num_in_osds 3)

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
2017-10-01 16:36:17 +02:00
PCzhangPC
2f0b233a31 rbd:export/import image-meta when we export/import an image
when we do exporting/importing an image, we should export or import the image-meta of this image at the same time

Signed-off-by: PCzhangPC <pengcheng.zhang@easystack.cn>
2017-09-29 13:30:01 +08:00
Jason Dillaman
9aa5dfb8ec rbd-mirror: sync image metadata when transfering remote image
Fixes: http://tracker.ceph.com/issues/21535
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-09-28 15:22:08 -04:00
Sage Weil
07fe4fd5b5 Merge pull request #17528 from liewegas/wip-mgr-localpool
pybind/mgr/localpool: module to automagically create localized pools

Reviewed-by: John Spray <john.spray@redhat.com>
2017-09-25 12:30:05 -05:00
Sage Weil
6383fa5b30 qa/workunits/mgr/test_localpool: simple test for localpool mode
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-25 12:34:53 -04:00
Sage Weil
e0beb1e02a Merge pull request #17848 from liewegas/wip-ruleset-errors
mon/OSDMonitor: error out if setting ruleset-* ec profile property

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2017-09-24 21:15:42 -05:00
Sage Weil
6376d75eda mon/OSDMonitor: error out if setting ruleset-* ec profile property
We change ruleset -> crush back in dc7a2aaf7a.
If someone tries to use the old property, error out early, instead of
silently not doing the thing they thought they told us to do.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-24 11:25:01 -04:00
xie xingguo
b60d3498e2 osd/PrimaryLogPG: prepare_transaction - fix EDQUOT vs ENOSPC
We now set full flag if a pool is currently running out of space and
set both full and full_no_quota flags if it is running out of quota.
Therefore the full_no_quota flag should be instead used to uniquely
identify whether we are running out of quota or not.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-20 08:49:42 +08:00
xie xingguo
5dd3458eec qa: fix pool-quota related tests
https://github.com/ceph/ceph/pull/17371 introduces support of
per-pool space-full flag, which turns out to set both
full and full_no_quota flags now if a pool is currently running out
of quota.

Actually this test is fragile as long as we keep appending new flags
at pool granularity, but let's not bother with that complexity now.

Fixes: http://tracker.ceph.com/issues/21409
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-16 13:50:18 +08:00
Mykola Golub
0bafa7e8d4 Merge pull request #17559 from dillaman/wip-21181
qa/workunits/rbd: relax greps to support upgrade formatting change

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-09-09 11:23:57 +03:00
Tamilarasi Muthamizhan
594b736228 Merge pull request #17536 from ceph/wip-cd-rbd-pool
qa/tests: fix rbd pool creation for systemd tests
2017-09-07 15:13:32 -07:00
Sage Weil
1006b62fe6 Merge pull request #17322 from liewegas/wip-post-luminous-mon
mon: remove pre-luminous compat cruft (2 of many)

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2017-09-07 13:47:43 -05:00
Sage Weil
e715533feb qa/workunits/*: require-osd-release mimic, not luminous
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-07 09:18:56 -04:00
Jason Dillaman
273c84578b qa/workunits/rbd: relax greps to support upgrade formatting change
Fixes: http://tracker.ceph.com/issues/21181
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-09-07 08:56:16 -04:00
Jason Dillaman
b0f1545d3b Merge pull request #16998 from trociny/wip-20860
rbd-mirror: update asok hook name on image rename

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-09-07 08:34:42 -04:00
Vasu Kulkarni
49f95b3d8b create the rbd pool right after install
rbd pool should exist for many rbd tests to work properly, create
the pool right after install is successful.

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-09-06 18:07:54 -07:00
Sage Weil
e21e63cb88 qa/workunits/cephtool/test.sh: drop 'pg set_full_ratio'
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-06 10:18:06 -04:00
Sage Weil
1ae70df392 Merge pull request #17329 from xiexingguo/wip-21162
mon/OSDMonitor: make 'osd crush rule rename' idempotent

Reviewed-by: Sage Weil <sage@redhat.com>
2017-08-29 15:58:21 -05:00
Yuri Weinstein
f4c4a9d90c Merge pull request #17125 from xiexingguo/wip-add-bucket-with-loc
mon/OSDMonitor: add location option for "crush add-bucket" command

Reviewed-by: Sage Weil <sage@redhat.com>
2017-08-29 09:12:43 -07:00
Mykola Golub
9ddb5da337 rbd-mirror: update asok hook name on image rename
Fixes: http://tracker.ceph.com/issues/20860
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2017-08-29 08:30:20 +02:00
xie xingguo
cd2191c3f1 mon/OSDMonitor: make 'osd crush rule rename' idempotent
Fixes: http://tracker.ceph.com/issues/21162
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-29 08:29:13 +08:00
Kefu Chai
30b5b4627c Merge pull request #16494 from asomers/bin_bash
misc: Fix bash path in shebangs

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-27 10:14:14 +08:00
Sage Weil
d930a4e062 Merge pull request #17029 from xiexingguo/wip-crush-rule-rename
mon: "ceph osd crush rule rename" support

Reviewed-by: Sage Weil <sage@redhat.com>
2017-08-25 10:21:38 -05:00
xie xingguo
1ea448ac75 common/types: make numbers a bit nicer when displaying space usage
Was:
----------------------------------------------------------------------------
GLOBAL:
    SIZE       AVAIL      RAW USED     %RAW USED
    30911M     27050M        3861M         12.49
POOLS:
    NAME                  ID     USED        %USED     MAX AVAIL     OBJECTS
    rbd                   0      101216k      1.10         8913M        1178
    cephfs_data_a         1            0         0         8913M           0
    cephfs_metadata_a     2          892         0         8913M          21
----------------------------------------------------------------------------

Now:
----------------------------------------------------------------------------
GLOBAL:
    SIZE      AVAIL     RAW USED     %RAW USED
    30.2G     26.4G        3.77G         12.50
POOLS:
    NAME                  ID     USED      %USED     MAX AVAIL     OBJECTS
    rbd                   0      99.2M      1.10         8.70G        1180
    cephfs_data_a         1          0         0         8.70G           0
    cephfs_metadata_a     2        892         0         8.70G          21
----------------------------------------------------------------------------

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-22 12:33:10 +08:00
xie xingguo
ac36b471a3 mon/OSDMonitor: add location option for "crush add-bucket" command
So we can combine "crush add-bucket" with "crush move" command,
and hence avoid making two separate changes to the osdmap,
and hence slow down map-epoch generation.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-22 10:39:03 +08:00
Xie Xingguo
89d28a176c Merge pull request #16955 from xiexingguo/wip-app-ls
mon/OSDMonitor: "osd pool application get" support

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-08-19 17:49:43 +08:00
Mykola Golub
c4c7075029 qa/workunits/rbd: test data pool is mirrored correctly
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2017-08-17 10:07:12 +02:00
xie xingguo
7c67f95201 crush, mon: "ceph osd crush rule ls-by-class" support
This command returns all crush rules that are currently
referencing the device class specified by user.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-17 13:34:36 +08:00
xie xingguo
46586b2288 mon/OSDMonitor: "osd pool application ls" support
It would be a pain if we have to call 'ceph osd dump --format=json-pretty'
to find out these each time...

Demo output:
(1) ceph osd pool application get
{
    "cephfs_data_b": {
        "cephfs": {}
    },
    "cephfs_metadata_a": {
        "cephfs": {}
    },
    "test_pool": {
        "rbd": {
            "test": "me"
        }
    }
}

(2) ceph osd pool application get test_pool
{
    "rbd": {
        "test": "me"
    }
}

(3) ceph osd pool application get test_pool rbd
{
    "test": "me"
}

(4) ceph osd pool application get test_pool rbd test
me

Fixes: http://tracker.ceph.com/issues/20976
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-16 09:41:11 +08:00
xie xingguo
a5075ed253 mon: "ceph osd crush rule rename" support
User may specify a rule with the same name of the pool that it serves.
Since a pool can be renamed, so does the rule.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-15 17:01:26 +08:00
Sage Weil
9c42597f09 qa/workunits/mon/crush_ops.sh: test weight sets vs device classes
Signed-off-by: Sage Weil <sage@redhat.com>
2017-08-11 09:40:11 -04:00
Yuri Weinstein
c1b87c71e3 Merge pull request #16892 from xiexingguo/wip-clean-pg-temp
mon/OSDMonitor: fix 'osd pg temp' unable to cleanup pg-temp

Reviewed-by: Sage Weil <sage@redhat.com>
2017-08-09 16:34:38 -07:00
Mykola Golub
6a575136a7 qa/workunits/rbd: use command line option to specify watcher asok
The previous method to get the watcher admin socket was fragile
and had started to fail after the recent changes to vstart ceph.conf.

Fixes: http://tracker.ceph.com/issues/20954
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2017-08-09 09:03:00 +02:00
xie xingguo
71cef3cb74 mon/OSDMonitor: fix 'osd pg temp' unable to cleanup pg-temp
This is not very elegant way but should work..

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-08 17:33:35 +08:00
Mykola Golub
b4dbfcc879 rbd-ggate: tool to map images on FreeBSD via GEOM Gate
rbd-ggate spawns a process responsible for the creation of ggate
device and forwarding I/O requests between the GEOM Gate kernel
subsystem and RADOS.

On FreeBSD it provides functionality similar to rbd-nbd on Linux.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2017-08-08 11:00:30 +02:00
Jason Dillaman
4e1b834d2d rbd-mirror: simplify resync handling within image replayer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-08-07 10:13:33 -04:00
xie xingguo
bfd1d4ef9a mon/OSDMonitor: sanity check osd before performing 'osd purge'
This will pervent OSDMonitor from crashing on purging a very large
non-existent osd id as below:

osd e11 prepare_command_osd_purge purging osd.8
    -1> 2017-08-05 18:59:44.994319 7f6076968700 10 mon.a@0(leader).osd e11 prepare_command_osd_destroy osd.8 does not exist.
     0> 2017-08-05 18:59:45.002309 7f6076968700 -1 /home/xxg/build/ceph-dev/src/osd/OSDMap.h: In function 'int OSDMap::get_state(int) const'
 thread 7f6076968700 time 2017-08-05 18:59:44.994336
/home/xxg/build/ceph-dev/src/osd/OSDMap.h: 690: FAILED assert(o < max_osd)

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-05 19:43:39 +08:00
Sage Weil
62e51661e6 Merge branch 'wip-qa-rbd-health' of git://github.com/dillaman/ceph
# Conflicts:
#	qa/tasks/ceph.py
2017-08-04 15:07:22 -04:00
Sage Weil
9c7a653fee Merge pull request #16769 from liewegas/wip-20295-b
os/bluestore: allow multiple DeferredBatches in flight at once

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-04 11:04:38 -05:00
Nathan Cutler
d919987caa tests: rbd: reproducer for rbd-on-EC issue
This introduces a new "rbd/singleton-bluestore" suite because creating an rbd
on an EC-backed datapool will fail on filestore.

References: http://tracker.ceph.com/issues/20295
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-08-03 22:54:17 -04:00
Kefu Chai
007095b7ae qa/workunits/mon/crush_ops.sh: remove existing dev class before setting it
we cannot overwrite existing dev class, and "osd_class_update_on_start"
is true by default (see 0c885d6). so we should remove all device classes before
setting them.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-08-03 17:26:26 -04:00
Jason Dillaman
c2b451e8cb qa: fix RBD-related POOL_APP_NOT_ENABLED health warnings
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-08-03 09:50:41 -04:00
Kefu Chai
d67d6c57ae qa/workunits/ceph-disk: fix the path to ceph-helpers-root.sh
partially reverts 841f3bd

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-08-01 21:54:44 +08:00
Kefu Chai
2a128f4829 Merge pull request #16599 from liewegas/wip-standalone-fixes
qa/workunits: adjust path to ceph-helpers.sh

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-28 13:18:47 +08:00
Alan Somers
3aae5ca6fd scripts: fix bash path in shebangs
/bin/bash is a Linuxism.  Other operating systems install bash to
different paths.  Use /usr/bin/env in shebangs to find bash.

Signed-off-by: Alan Somers <asomers@gmail.com>
2017-07-27 13:24:26 -06:00
Sage Weil
c1aef68f02 Merge pull request #16569 from liewegas/wip-set-not-put
mon: 'config-key put' -> 'config-key set'

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2017-07-27 11:34:37 -05:00
Sage Weil
c7430c56cd Merge pull request #16388 from xiexingguo/wip-class-misc-fixes
crush, mon: simplify device class manipulation commands

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-27 11:04:33 -05:00
Jason Dillaman
42fabc2e80 Merge pull request #16398 from dillaman/wip-20655
rbd-mirror: guard the deletion of non-primary images

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2017-07-27 08:27:39 -04:00
Sage Weil
5534912daa qa/workunits/cephtool/test.sh: add some config-key tests
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-26 14:13:22 -04:00
Sage Weil
4eb1a518e3 mon: 'config-key put' -> 'config-key set'
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-26 14:10:08 -04:00
Sage Weil
ee06dc6996 Merge pull request #16530 from xiexingguo/wip-fix-pgtemp
mon: prime pg_temp and a few health warning fixes

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-26 13:09:33 -05:00
xie xingguo
a27fd9d25c crush: kill "class create" command
The device class is now self and automatically managed.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-26 22:40:17 +08:00
Sage Weil
742005bd75 Merge pull request #16579 from liewegas/wip-fix-nonregression
qa/suites/rados/singleton/all/erasure-code-nonregression: fix typo

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Amik Kumar <amitkuma@redhat.com>
2017-07-26 08:46:43 -05:00
Sage Weil
c1bdd36d8f qa/workunits/erasure-code/encode-decode-nonregression: do not require git checkout
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-26 09:35:46 -04:00
Sage Weil
841f3bdf92 qa/workunits: adjust path to ceph-helpers.sh
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-26 08:08:01 -04:00
Kefu Chai
d85a7889fd Merge pull request #16446 from xiexingguo/wip-destroyed
mon: show destroyed status in tree view; do not auto-out destroyed osds

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-26 17:15:53 +08:00
xie xingguo
96eb0a9887 mon/OSDMonitor: apply new 'destroyed' status to 'osd tree' filter
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-26 15:13:32 +08:00
Sage Weil
d2c31a8114 Merge pull request #16469 from xiexingguo/wip-fix-test
test: s/osd_objectstore_type/osd_objectstore
2017-07-25 21:04:22 -05:00
Sage Weil
a264725b62 Merge pull request #16541 from liewegas/wip-20761
qa/workunits/cephtool/test.sh: disable 'fs status' until bug is fixed
2017-07-25 14:03:38 -05:00
Jason Dillaman
76fd882464 qa/workunits/rbd: rbd-mirror now treats no primary image as unknown state
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-25 07:17:15 -04:00
xie xingguo
450633b9e6 mon/OSDMonitor: ENOENT on removing non-existent app key
So we don't bother to trigger an pool update, which is potentially
big stuff.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-25 13:19:35 +08:00
xie xingguo
b4dcdecb6a mon/OSDMonitor: ENOENT on disabling non-existend app
so we don't bother to trigger an pool update, which is potentially
big stuff.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-25 13:19:29 +08:00
Sage Weil
71ea171604 qa: move ceph-helpers and misc src/test/*.sh tests to qa/standalone
- stop running via make check
- add teuthology yamls to run them
- disable ceph_objecstore_tool.py for now (too slow for make check, and
we can't use vstart in teuthology via a package install)
- drop cephtool tests since those are already covered by other teuthology
tests
- leave a handful of (fast!) ceph-helpers tests for make check for minimal
integration tests.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-24 22:11:49 -04:00
Sage Weil
f347ef54c2 qa/workunits/cephtool/test.sh: disable 'fs status' until bug is fixed
See http://tracker.ceph.com/issues/20761
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-24 16:54:13 -04:00
Sage Weil
fc8374b472 Merge pull request #16326 from liewegas/wip-weight-set
crush,mon: add weight-set introspection and manipulation commands

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com
2017-07-24 08:27:06 -05:00
Sage Weil
08bdc2c867 Merge pull request #16500 from liewegas/wip-compact-sudo
qa/workunits/cephtool/test.sh: add sudo for daemon compact

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-22 13:01:20 -05:00
xie xingguo
fa0e314cde test: s/osd_objectstore_type/osd_objectstore/
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-22 15:22:31 +08:00
Sage Weil
4e6487cad4 Merge pull request #15991 from dillaman/wip-rbd-auth-profile
mon,osd: new rbd-based cephx cap profiles

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-21 22:38:42 -05:00
Sage Weil
0429acda45 Merge pull request #16460 from liewegas/wip-mgr-metadata
mon: add mgr metdata commands, and overall 'versions' command for all daemon versions

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-21 22:36:09 -05:00
Sage Weil
2f272ab451 qa/workunits/cephtool/test.sh: add sudo for daemon compact
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-21 23:18:03 -04:00
Jason Dillaman
44fa7ee788 qa/workunits/rbd: rbd-mirror tests should use 'mirror' user
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-21 14:30:18 -04:00
Jason Dillaman
d32485ff37 qa/workunits/rbd: devstack test should use auth profiles
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-21 14:30:18 -04:00
Sage Weil
09b89ace82 qa/workunits/mon/crush_ops.sh: fix in-use rule removal test
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-21 13:50:57 -04:00
Sage Weil
fac1de8259 qa/workunits/mon/crush_ops: require luminous clients for test
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-21 13:50:57 -04:00
Sage Weil
70263dae67 mon: 'osd crush weight-set {ls,dump,create[-compat],rm[-compat],reweight[-compat]}' commands
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-21 13:50:52 -04:00
Kefu Chai
10b88b5d82 test: create asok files in a temp directory under $TMPDIR
to shorten the pathname of unix domain socket created for admin socket,
so it does not exceed the limit of 107 on GNU/Linux:

* ceph-helper.sh: the temp directory is named ${TMPDIR:-/tmp}/ceph-asok.$$
* vstart.sh: the temp directory is named `mktemp -u -d "${TMPDIR:-/tmp}/ceph-asok.XXXXXX"`

Fixes: http://tracker.ceph.com/issues/16895
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-22 01:05:29 +08:00
Sage Weil
cb084a55f6 Merge pull request #16453 from liewegas/wip-workloadgen
crush: enforce buckets-before-rules rule

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2017-07-21 11:01:22 -05:00
Sage Weil
75ac7d85da qa/workunits/cephtool/test.sh: add a few tests
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-21 11:25:05 -04:00
Sage Weil
6c4992aeca qa/workunits/cephtool/test.sh: fix test to watch audit channel
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-21 11:40:48 +08:00
Sage Weil
2e8413dede qa: remove workloadgen test
The CRUSH rule creation is busted (rules and buckets out of order), but
after I fix that it doesn't seem to run right anyway.  Remove it.
We get the mon thrasher coverage from rados/monthrash already; I don't
think this is adding meaningful coverage for the amount of effort it takes
to maintain.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-20 18:06:50 -04:00
Sage Weil
3de9f22ce0 Merge pull request #16423 from liewegas/wip-ls
mon: '* list' -> '* ls'

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-20 10:43:34 -05:00
Kefu Chai
acc24bf0dc Merge pull request #16444 from tchaikov/wip-test-osd-stat
qa/workunits/cephtool/test.sh: "ceph osd stat" output changed, update accordingly

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2017-07-20 23:41:53 +08:00
Kefu Chai
ba525a829c qa/workunits/cephtool/test.sh: "ceph osd stat" output changed, update test accordingly
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-07-20 19:34:53 +08:00
Willem Jan Withagen
e3760fa936 cephtool/test.sh: Only delete a test pool when no longer needed.
the pool_getset pool is deleted before all tests on it are complete

4: /home/jenkins/workspace/ceph-master/qa/workunits/cephtool/test.sh:1990: test_mon_osd_pool_set:  ceph osd pool delete pool_get
set pool_getset --yes-i-really-really-mean-it
4: pool 'pool_getset' removed
4: /home/jenkins/workspace/ceph-master/qa/workunits/cephtool/test.sh:1992: test_mon_osd_pool_set:  ceph osd pool get rbd crush_r
ule
4: /home/jenkins/workspace/ceph-master/qa/workunits/cephtool/test.sh:1992: test_mon_osd_pool_set:  grep 'crush_rule: '
4: crush_rule: replicated_rule
4: /home/jenkins/workspace/ceph-master/qa/workunits/cephtool/test.sh:1994: test_mon_osd_pool_set:  ceph -f json osd pool get poo
l_getset compression_mode
4: Error ENOENT: unrecognized pool 'pool_getset'

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-07-20 12:24:14 +02:00
Kefu Chai
aea471d73a Merge pull request #16403 from wjwithagen/bug-wjw-ceph-osd-stat
test: ceph osd stat out has changed, fix tests for that

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-20 18:06:47 +08:00
Jason Dillaman
836ab7ad95 test: skip pool application metadata tests if OSDs not at min luminous
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-19 13:13:01 -04:00
Jason Dillaman
fa90be842e test: enable pool applications for new pools
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-19 13:13:01 -04:00
Jason Dillaman
3514d6e53e mon: added new "osd pool application" commands
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-19 13:13:01 -04:00
Sage Weil
572a942f8f mon: 'auth list' -> 'auth ls'
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-19 12:33:14 -04:00
Willem Jan Withagen
4f49402589 qa/workunits/cephtool/test.sh: ceph osd stat out has changed, fix tests for that
The output of ceph osd stat has changed,
It printed:

cluster b370a29d-9287-4ca3-ab57-3d824f65e339
 health HEALTH_OK
 monmap e1: 1 mons at {ceph1=10.0.0.8:6789/0}, election epoch 2, quorum 0 ceph1
 osdmap e63: 2 osds: 2 up, 2 in
  pgmap v41338: 952 pgs, 20 pools, 17130 MB data, 2199 objects
        115 GB used, 167 GB / 297 GB avail
             952 active+clean

but now the osdmap line has gone and thus this no longer works:
qa/workunits/cephtool/test.sh:1944:
old_pgs=$(ceph osd pool get $TEST_POOL_GETSET pg_num | sed -e 's/pg_num: //')
new_pgs=$(($old_pgs+$(ceph osd stat | grep osdmap | awk '{print $3}')*32))

4: qa/workunits/cephtool/test.sh: line 1945: 10+*32: syntax errotoken is "*32")

 - And parse the output in json , with jq, for better reliability

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-07-19 16:34:12 +02:00
Sage Weil
fd9582f085 Merge pull request #15432 from dachary/wip-osd-new
ceph-disk: support osd new

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-18 13:12:51 -05:00
Sage Weil
81ae434c7f Merge pull request #16359 from liewegas/wip-cli-stdinout
ceph: allow '-' with -i and -o for stdin/stdout

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-07-18 08:39:14 -05:00
Sage Weil
3a4931b0e4 ceph: allow '-' with -i and -o for stdin/stdout
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-17 09:38:52 -04:00
Sage Weil
dd61a7f737 Merge pull request #16189 from bassam/pr-msgr-bind-addr
mon: add support public_bind_addr option

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-16 21:26:23 -05:00
Sage Weil
6e33ba0183 Merge pull request #16349 from liewegas/wip-vstart-bind
vstart.sh: bind restful, dashboard to ::, not 127.0.0.1

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-16 21:24:53 -05:00
Sage Weil
f9433e488b qa/suites/rados/rest/mgr-restful: simplify
Use default port; don't bother setting bind addr.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-16 21:28:03 -04:00
Kefu Chai
73c0740b08 tests: ceph-disk: use communicate() instead of wait() for output
to avoid possible deadlock. quote from doc of Popen.wait()

> This will deadlock when using stdout=PIPE and/or stderr=PIPE and the
child process generates enough output to a pipe such that it blocks
waiting for the OS pipe buffer to accept more data. Use communicate() to
avoid that.

and print out the stdout and stderr using LOG.warn() if the command
fails.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-15 11:27:02 +08:00
Kefu Chai
0cc65197d6 Merge pull request #16045 from Liuchang0812/wip-compact-osd-feature
osd: compact osd feature

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-15 10:57:13 +08:00
Sage Weil
d52763c2cc Merge pull request #16221 from liewegas/wip-20546
crush/CrushWrapper: make get_immediate_parent[_id] ignore per-class shadow hierarchy

Reviewed-by: Neha Ojha <nojha@redhat.com>
2017-07-14 15:09:22 -05:00
Loic Dachary
d199cedc8f tests: ceph-disk destroy needs --purge
The former semantic of ceph-disk destroy is now implemented with the
--purge flag. Use that for the ceph-disk suite.

Signed-off-by: Loic Dachary <loic@dachary.org>
2017-07-14 19:47:01 +02:00
Loic Dachary
91b9646f71 tests: count OSD ids in PGs {wait,get}_osd_id_used_by_pgs
Signed-off-by: Loic Dachary <loic@dachary.org>
2017-07-14 19:47:00 +02:00
Loic Dachary
1902a414f3 tests: ceph-helper uses ceph osd purge
Instead of removing each element related to an OSD individually.

Signed-off-by: Loic Dachary <loic@dachary.org>
2017-07-14 19:47:00 +02:00
Bassam Tabbara
a8da9fd077 test,qa/workunits: add tests for public_bind_addr
Add a set of new tests for the case when public_addr and public_bind_addr
are different for a mon. In order to test this properly I had to employ
port forwarding with socat. This helps simulate what would happen in a
environment like Kubernetes. socat is now a build dependency.

Also, moved jq_success to ceph-helpers.sh and refactored run_mon to enable
creating the mons without creating the rbd pool immediately.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
2017-07-14 10:41:49 -07:00
Kefu Chai
33ab6ed595 Merge pull request #16319 from tchaikov/wip-ceph-helper-with-exp-features
qa/workunits/ceph-helpers: enable experimental features for osd

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-07-14 11:13:57 +08:00
Sage Weil
12c6cfa5f1 qa/workunits/rados/test_health_warnings: test down msgs vs crush classes
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-13 12:15:26 -04:00
Sage Weil
95c07fbe96 Merge pull request #16014 from xiexingguo/wip-autoclass
osd/OSD: auto class on osd start up

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-13 10:50:45 -05:00
liuchang0812
d1f24d053f test: add test of ceph compact command
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-07-13 22:06:35 +08:00
Kefu Chai
4a3cdb00c6 qa/workunits/ceph-helpers: enable experimental features for osd
it matches the settings in vstart.sh, also it would be handy for those
who are still developing on btrfs, which is now marked as an experimental
features now.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-13 18:08:44 +08:00
Kefu Chai
a2335091d6 qa/workunits/ceph-helpers: test wait_for_health_ok differently
0 OSDs is not an error anymore in the new health checking implemented by
OSDMap::check_health(). this case was treated as an error before, see
OSDMonitor::get_health(). but an osdmap without any OSD is fine, i
think. but an osdmap with 3 OSDs, but all of them are down and out, this
is an error. and we do report this as an error. so, let's update the
test instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-13 17:49:44 +08:00
Sage Weil
7e48efb061 qa/workunits/cephtool/test.sh: adjust full tests to avoid races
OSDs may report fullness in any order.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-12 12:52:03 -04:00
Sage Weil
7302b49723 qa/workunits/cephtool/test.sh: adjust for new health error codes
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-12 12:52:03 -04:00
Sage Weil
bfe4c08429 osd/OSDMap: add per-osd flag OSD_FLAGS check
rename OSD_FLAGS to OSDMAP_FLAGS

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-12 12:52:02 -04:00
Sage Weil
6068e1856d mon/Monitor: move time sync status from 'ceph health' to 'time-sync-status' command
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-12 12:51:30 -04:00
Sage Weil
cb2cc82d93 Merge pull request #16239 from xiexingguo/wip-crush-weight-overflow
mon: a few more upmap (and other) fixes

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-11 12:56:15 -05:00
xie xingguo
5f9de0e611 mon/OSDMonitor: sanity check osd number before applying pg-temp
In case user did something stupid and causing weird results.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-11 02:14:06 +08:00
John Spray
44bce9e02c Merge pull request #15858 from liewegas/wip-mgr-servicemap
mgr,librados: service map

Reviewed-by: John Spray <john.spray@redhat.com>
2017-07-10 15:03:07 +01:00
xie xingguo
7d07356383 crush: fix potential weight overflow
E.g.:
./bin/ceph osd crush reweight osd.0 32768

ID WEIGHT      TYPE NAME                                            UP/DOWN REWEIGHT PRIMARY-AFFINITY
-4 32770.00000 root default~hdd
-3           -     host gitbuilder-ceph-rpm-centos7-amd64-basic~hdd
 0           -         osd.0                                             up  1.00000          1.00000
 1     1.00000         osd.1                                             up  1.00000          1.00000
 2     1.00000         osd.2                                             up  1.00000          1.00000
-1 32770.00000 root default
-2           -     host gitbuilder-ceph-rpm-centos7-amd64-basic
 0           -         osd.0                                             up  1.00000          1.00000
 1     1.00000         osd.1                                             up  1.00000          1.00000
 2     1.00000         osd.2                                             up  1.00000          1.00000

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-10 11:23:36 +08:00
xie xingguo
c5b99afa73 test: fix ut and release-notes
To keep pace with the newly merged https://github.com/ceph/ceph/pull/16027

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-10 08:55:15 +08:00
Sage Weil
aabe0e35a0 librados: allow service registrations
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-09 14:09:04 -04:00
Sage Weil
8b21c6b6fd Merge pull request #16027 from liewegas/wip-crush-rule-class
mon,crush: create crush rules using device classes for replicated and ec pools via cli

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-07-08 21:34:13 -05:00
Sage Weil
a0ba660afc Merge pull request #16025 from liewegas/wip-19964
mon: do crushtool test with fork and timeout, but w/o exec of crushtool

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-07-08 09:01:10 -05:00
Vasu Kulkarni
71e0922cfa create rbd pool since its not created by default anymore
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-07-07 09:23:43 -07:00
Sage Weil
65d9d667ec qa/workunits/cephtool/test.sh: remove two crushtool validation tests
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-07 11:11:25 -04:00
Patrick Donnelly
8f121c70d3
Merge remote-tracking branch 'upstream/pull/15844/head' into master
* commit '47ab651a1f':
  qa: reset journal before cephfs_journal_tool_smoke.sh exits
  qa: remove 'apply' from journal_tool_smoke.sh

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-07-06 22:16:02 -07:00
Sage Weil
5870a68c00 Merge pull request #15647 from gmayyyha/format-config-show
common,config: OPT_FLOAT and OPT_DOUBLE output format in config show

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-06 21:25:19 -05:00
Sage Weil
7f18184f63 qa/workunits/mon/crush_ops.sh: require luminous before using device classes
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-06 15:01:03 -04:00
Sage Weil
8fb2517057 erasure-code: implement 'crush-device-class' ec profile property
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-06 15:01:03 -04:00
Sage Weil
dc7a2aaf7a erasure-code: ruleset-* -> crush-*
1) ruleset is an obsolete term, and
2) crush-{rule,failure-domain,...} is more descriptive.

Note that we are changing the names of the erasure code profile keys
from ruleset-* to crush-*.  We will update this on upgrade when the
luminous flag is set, but that means that during mon upgrade you cannot
create EC pools that use these fields.

When the upgrade completes (users sets require_osd_release = luminous)
existing ec profiles are updated automatically.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-06 15:01:03 -04:00
Sage Weil
5a4ba443c4 mon,crush: 'osd crush rule create-replicated ...'
New command to create crush rule that specifies a class of device.  Plus
all of the fallout in other callers to the CrushWrapper helpers, the
crushtool cli change, and cli test.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-06 15:00:37 -04:00
Kefu Chai
04e0ef541d Merge pull request #15754 from tchaikov/wip-test-auth-caps
qa/suites: add test exercising workunits/mon/auth_caps.sh

Reviewed By: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2017-07-05 15:05:21 +08:00
John Spray
b363e58530 Merge pull request #15958 from liewegas/wip-mgr-modules
mgr,mon: enable/disable mgr modules via 'ceph mgr module ...' commands

Reviewed-by: John Spray <john.spray@redhat.com>
2017-07-05 00:04:59 +01:00
Mykola Golub
866cf72440 Merge pull request #15956 from dillaman/wip-librbd-devstack
test: fix failing rbd devstack teuthology test

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-07-01 15:02:29 +03:00
Sage Weil
d953198aff mon,mgr: track available modules in MgrMap too
Require --force to enable a module that isn't reported as available.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-29 23:10:51 -04:00
Sage Weil
16fcee1f71 mon,mgr: manage mgr module list in mgrmap
Kill old mgr_modules option.

Add new mgr_initial_modules option, on the mon, for the initial cluster
mgrmap.

Add ls, enable, disable commands.

Respawn mgr if the module list changes.  In the future we could enable
new modules without a full restart, but disabling probably requires (and
is best handled by) a respawn.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-29 23:10:51 -04:00
Sage Weil
7fe818990a Merge pull request #15968 from xiexingguo/wip-poolopts-fix
mon/OSDMonitor: two pool opts related fix

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-29 22:03:02 -05:00
Kefu Chai
7ee4907698 Merge pull request #15925 from jcsp/wip-fsstatus-cleanup
mgr: clean up fsstatus module

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-30 09:31:02 +08:00
Josh Durgin
4bcd6f666b Merge pull request #14760 from dzafman/wip-19657
osd: On EIO from read recover the primary replica from another copy

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-06-29 14:00:18 -07:00
Yan, Zheng
47ab651a1f qa: reset journal before cephfs_journal_tool_smoke.sh exits
Fixes: http://tracker.ceph.com/issues/20440
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
2017-06-29 17:44:19 +08:00
Sage Weil
93918b0be5 test,qa/workunits: fix a zillion tests
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-28 10:52:49 -04:00
Sage Weil
118dc27989 qa/workunits/ceph-helpers: shorten mon connect timeout
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-28 10:52:49 -04:00
Greg Farnum
3e8bdac704 cephtool/test: create an rbd pool since it's no longer automatic
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2017-06-28 10:52:49 -04:00
xie xingguo
db42eef59d os/bluestore: allow user to unset pool compression_mode[algorithm] properly
A string-typed pool option requires user pass in a empty string to do a valid cancellation,
but the "osd pool set " command won't allow it. E.g.:
./bin/ceph osd pool set rbd compression_mode
Invalid command:  missing required parameter val(<string>)

Since we already use the "unset" keyword to cancel the csum_type setting,
we could simply extends the above mechanism for compression_mode
and compression_algorithm too.

E.g.:
./bin/ceph osd pool set rbd compression_algorithm zlib
set pool 0 compression_algorithm to zlib

 ./bin/ceph osd pool set rbd compression_algorithm unset
unset pool 0 compression_algorithm

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-28 20:15:17 +08:00
Jason Dillaman
68932d931e qa/workunits/rbd: preserve devstack configuration files
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-06-27 12:48:11 -04:00
Jason Dillaman
8e1791ff7e qa/workunits/rbd: install noVNC from packaging
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-06-27 12:48:11 -04:00
John Spray
4840a5d505 qa: call into status module from cephtool test
Signed-off-by: John Spray <john.spray@redhat.com>
2017-06-27 15:10:50 +01:00
John Spray
6ec69a4547 qa: update cephtool test for multimds on by default
Signed-off-by: John Spray <john.spray@redhat.com>
2017-06-23 17:07:34 +01:00
David Zafman
6e5f3cdc69 test: Use correct argument --read-perecent
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-06-23 08:02:50 -07:00
Sage Weil
11d9541a6f mon: 'mon feature list' -> 'mon feature ls'
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-23 10:36:18 -04:00
Kefu Chai
b86cda7040 Merge pull request #15764 from tchaikov/wip-20342
qa/suites/upgrade/hammer-jewel-x: add luminous.yaml

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-06-23 22:26:03 +08:00
John Spray
5f18153f72 qa: remove 'apply' from journal_tool_smoke.sh
Recently removed this command from the tool.  The
correct one is `recover_dentries`.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-06-22 11:52:23 +01:00
Mykola Golub
0d26ae3be0 Merge pull request #15317 from liupan1111/wip-fix-list
rbd-nbd: display pool/image/snap information in list output

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-06-22 07:31:32 +03:00
Kefu Chai
fea6e3216a qa/workunits/rbd: do not test --export-format unless supported
in 55edd81, test for `--export-format` was added to exercise this
option. but this option is only supported on luminous, so we need to
check if it's avaialble before using it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-22 12:19:01 +08:00
Kefu Chai
5d252a27a1 a/workunits/rados/test_envlibrados_for_rocksdb.sh: git clone --depth 1
no need to clone the whole history of rocksdb, we just need the HEAD of
master. so "--depth 1" is better and faster in this case.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-22 12:19:01 +08:00
Sage Weil
288f623878 Merge pull request #15354 from badone/wip-rados-ls-auth-fix
osd: Reverse order of op_has_sufficient_caps and do_pg_op

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-06-21 21:14:01 -05:00
Kefu Chai
720aea32bc Merge pull request #15444 from wjwithagen/wip-wjw-freebsd-termwidth
test: Make screencandy optional for FreeBSD

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-22 07:46:57 +08:00
Sage Weil
1e7cd3550c Merge pull request #13683 from liewegas/wip-crush-rulesets
crush: detect and (usually) fix ruleset != rule id

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-06-21 08:45:42 -05:00
Sage Weil
abad4772e0 osd: replicated_ruleset -> replicated_rule
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-20 17:45:59 -04:00
Kefu Chai
a65b08fe6e qa/workunits/cephtool/test.sh: only include last line for epoch
/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/qa/workunits/cephtool/test.sh:1606: test_mon_crush:  epoch='2017-06-20 04:44:52.862459 ffffad4d0200 -1 asok(0xffffa8000b10) AdminSocketConfigObs::init: failed: AdminSocket::bind_and_listen: The UNIX domain socket path /home/jenkins-build/build/workspace/ceph-pull-requests-arm64/build/src/test/td/t-7202/out/client.admin.48876.asok is too long! The maximum length on this system is 107
12'
/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/qa/workunits/cephtool/test.sh:1607: test_mon_crush:  '[' '2017-06-20 04:44:52.862459 ffffad4d0200 -1 asok(0xffffa8000b10) AdminSocketConfigObs::init: failed: AdminSocket::bind_and_listen: The UNIX domain socket path /home/jenkins-build/build/workspace/ceph-pull-requests-arm64/build/src/test/td/t-7202/out/client.admin.48876.asok is too long! The maximum length on this system is 107
12' -gt 1 ']'
/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/qa/workunits/cephtool/test.sh: line 1607: [: 2017-06-20 04:44:52.862459 ffffad4d0200 -1 asok(0xffffa8000b10) AdminSocketConfigObs::init: failed: AdminSocket::bind_and_listen: The UNIX domain socket path /home/jenkins-build/build/workspace/ceph-pull-requests-arm64/build/src/test/td/t-7202/out/client.admin.48876.asok is too long! The maximum length on this system is 107
12: integer expression expected

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-20 16:21:28 +08:00
Sage Weil
6f1a5946b6 mon/OSDMonitor: rename functions and variables, ruleset -> rule
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-19 19:09:06 -04:00
Sage Weil
07abacb2e4 osd/osd_types: pg_pool_t: rename crush_ruleset -> crush_rule
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-19 19:09:06 -04:00
Sage Weil
36cb4629dc Merge pull request #15533 from liewegas/wip-crush-version
mon,osd: add crush_version to OSDMap, and allow crush map updates to gate on crush_version

Reviewed-by: Loic Dachary <loic@dachary.org>
2017-06-19 18:06:07 -05:00
Sage Weil
74087cf5ab qa/workunits/cephtool/test.sh: silence dev warnings
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-19 14:11:57 -04:00
Brad Hubbard
a921882e7c osd: Reverse order of op_has_sufficient_caps and do_pg_op
Fixes: http://tracker.ceph.com/issues/19790

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2017-06-19 15:23:17 +10:00
Kefu Chai
03b4a83f14 qa/workunits/mon/auth_caps.sh: remove tests for blank cap
* remove tests for blank cap: this feature is not supported/implemented by AuthMonitor.
* remove cap for client.baz after done with it. so we don't have error
  like: "entity client.baz exists but caps do not match" when trying to
  re-set the cap of it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-19 12:58:17 +08:00
Kefu Chai
9e1d85775a qa/workunits/mon/auth_caps.sh: Revert "qa/workunits: mon: auth_caps: account for mon blank caps"
This reverts commit f0653c0401.

--force is not implemented by AuthMonitor. so revert this change to test
it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-19 11:04:21 +08:00
Pan Liu
a899bee57e qa/workunits: update rbd-nbd.sh for the changes of rbd-nbd list-mapped.
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
2017-06-18 16:13:11 +08:00
xie xingguo
f53559f95b mon/OSDMonitor: batch noup/noin osds support
This is a follow-up change of https://github.com/ceph/ceph/pull/15381.
This patch also simplifies the original code logic a bit.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-18 08:39:50 +08:00
Sage Weil
078e910eff Merge pull request #15675 from gregsfortytwo/wip-bad-command
mon,mgr: fix "ceph osd df", add some tools to find untested commands

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-15 16:34:10 -05:00
Sage Weil
307026a468 mon/OSDMonitor: add prior_version arg to 'osd crush set', 'osd setcrushmap'
If the prior_version doesn't match, reject the update.

Note that we also allow the crush_version-1 iff the proposed map is
identical to the current map in order to make the command idempotent.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-15 13:41:30 -04:00
Yanhu Cao
26cb1537c0 common,config: OPT_FLOAT and OPT_DOUBLE output format in "config show"
Fixes: http://tracker.ceph.com/issues/20104

Signed-off-by: Yanhu Cao <gmayyyha@gmail.com>
2017-06-15 10:51:02 +08:00