Commit Graph

293 Commits

Author SHA1 Message Date
Sage Weil
052fa90eb7 Merge pull request #7062 from wonzhq/scrub-prio-pool
osd: add the support of per pool scrub priority

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-30 08:24:43 -04:00
Sage Weil
359d8324a3 qa/workunits/cephtool/test.sh: fix cache mode tests
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-28 16:57:42 -04:00
Sage Weil
6a80e2df8b qa/workunits: remove 'mds setmap' from workunits
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-15 09:44:19 -04:00
John Spray
22ff1224fd qa: update cephtool test for CephFS multi filesystems
Includes adding test for the enable_multiple flag.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-03-10 11:18:28 +00:00
Sage Weil
2b9775db2c Merge pull request #7890 from liewegas/wip-reweight
mon: osd [test-]reweight-by-{pg,utilization} command updates

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-03-09 14:06:30 -05:00
Sage Weil
661891aa28 mon: remove range=100 from reweight-by-* commands
Specifying the range makes it skip instead of error when you give
it a bad value.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-09 13:25:55 -05:00
Sage Weil
3a72d21e30 Merge pull request #7861 from tchaikov/wip-14910
qa/workunits/cephtool/test.sh: wait longer in ceph_watch_start()

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-07 12:23:46 -05:00
Sage Weil
28b33a5b57 qa/workunits/cephtool/test.sh: test reweight-by-x commands
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-03 13:49:06 -05:00
Kefu Chai
389ecbbc2a Merge pull request #7390 from badone/wip-13829
common: Allow OPT_INT settings with negative values

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2016-03-02 11:22:24 +08:00
Kefu Chai
6eff39af79 qa/workunits/cephtool/test.sh: wait longer in ceph_watch_start()
"ceph --watch-debug" and "ceph tell mon.foo version" could connect
to different monitors, and there is chance that "ceph --watch-debug"
is not connected yet when "ceph tell" completes, and hence the former
fails to collect the cluster log including the "ceph tell" related
message. this renders test_mon_tell() unreliable. so, in
ceph_watch_start(), we should wait until the "ceph" cli connects to the
monitor and receives messages from it.

Fixes: #14910
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-03-01 20:48:24 +08:00
Zhiqiang Wang
23f3d30987 qa/workunits: add test for setting scrub priority
Signed-off-by: Zhiqiang Wang <zhiqiang@xsky.com>
2016-02-25 06:07:59 -05:00
Sage Weil
50821fa296 Merge pull request #7248 from ukernel/jewel-14379
mon/MDSMonitor: add confirmation to "ceph mds rmfailed"

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2016-01-29 08:27:37 -05:00
Brad Hubbard
994ac2942d qa: Add test for #13829
qa/workunits/cephtool/test.sh: add test for setting negative int options
src/test/daemon_config.cc: remove tests for failed negative values

Fixes: #13829

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2016-01-29 18:06:45 +10:00
Gregory Farnum
5aef0189b6 Merge pull request #7262 from ukernel/jewel-14380
Be more careful about the "mds setmap" command to prevent breakage.

Reviewed-by: John Spray <john.spray@redhat.com>
2016-01-28 21:26:06 -08:00
Yan, Zheng
8af0758638 qa/workunits/cephtool/test.sh: update test for "ceph mds setmap"
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2016-01-20 11:47:24 +08:00
Yan, Zheng
02d15bb434 mon/MDSMonitor: Add confirmation to "ceph mds rmfailed"
Fixes: #14379
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2016-01-20 10:47:13 +08:00
Sage Weil
b8bc25b0f0 Merge pull request #7087 from H3C/wip-yrf-cephdf
mon: add RAW USED column to ceph df detail

Reviewed-by: Sage Weil <sage@redhat.com>
2016-01-14 19:00:16 -05:00
Sage Weil
d93d92a7f4 Merge pull request #7085 from tchaikov/wip-11692
config: complains when a setting is not tracked

Reviewed-by: Sage Weil <sage@redhat.com>
2016-01-12 21:26:24 -05:00
Ruifeng Yang
2b597ae6d4 mon: add a column 'RAW USED' for ceph df detail
Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
2016-01-12 22:08:47 +08:00
Sage Weil
37c6390a77 qa/workunits/cephtool/test.sh: leave sortbitwise set
New backends don't work if it's off.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-01-01 13:09:17 -05:00
Kefu Chai
6a59aae076 config: complains when a setting is not tracked
* not all config items are tracked, so it does not take any effect after
  we sucessfully changed them using "ceph tell <daemon> injectargs  --foo-bar 15',
  as shown by the command output:
    $daemon: foo_bar = '15'
  if foo-bar happens to be the one not tracked by any components in <daemon>.
  in this fix, the message of
    $daemon: foo_bar = '15' (unchangeable)
  is returned instead. nevertheless, the config is still updated. as
  "ceph daemon <daemon> config show | grep foo_bar" shows:
    "foo_bar": "15"
  this helps user to understand that the setting is not dynamically
  changeable.
* update the test accordingly

Fixes: #11692
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-12-31 00:35:58 +08:00
John Spray
42389742c2 mon: add osd blacklist clear
This is just like 'blacklist rm' except it removes
everything.  Useful if you've got a whole bunch of
things in your blacklist and you don't want to wait
for N "blacklist rm" commands to run.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-12-16 12:02:36 +00:00
Robin H. Johnson
cd0c13bbf0 qa/workunits/cephtool/test.sh: false positive fail on /tmp/obj1.
If /tmp/obj1 happened to exist already, and was not writable by the
testing user, then this test failed!

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2015-12-07 15:27:12 -08:00
Sage Weil
c3e3ee05d8 Merge pull request #5953 from guangyy/wip-13121
osd: support pool level recovery_priority and recovery_op_priority

Reviewed-by: David Zafman <dzafman@redhat.com>
2015-12-04 10:09:13 -05:00
Guang Yang
ba346bf432 qa: add a test for the recovery_priority/recovery_op_priority pool settings.
Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
2015-12-03 02:16:52 +00:00
Sage Weil
35403da171 qa/workunits/cephtool/test.sh: no ./
Introduced by 1ace4d03b2

Signed-off-by: Sage Weil <sage@redhat.com>
2015-12-01 08:14:53 -05:00
Mykola Golub
e6dcf1419a osd: store per pool scrub intervals in pool options
ceph osd pool set $POOL scrub_min_interval N
  ceph osd pool set $POOL scrub_max_interval N
  ceph osd pool set $POOL deep_scrub_interval N

If N > 0, this value is used for the pool instead of
the corresponding global parameter from the config
(osd_scrub_min_interval, osd_scrub_max_interval or
osd_deep_scrub_interval).

Fixes: #13077
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-11-27 13:35:51 +02:00
Sage Weil
d633b64566 Merge pull request #5734 from cxwshawn/mon-fix
auth: make keyring without mon entity type return -EACCES

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-26 17:24:59 -05:00
Sage Weil
6cbdd6750c mon/PGMonitor: remove map_pg_creates, send_pg_creates commands
These shouldn't be triggered manually.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-23 08:38:50 -05:00
Xiaowei Chen
1ace4d03b2 auth: keyring without mon entity type should return -EACCES
test:
                         see test.sh:test_mon_caps
                         before modify:
                         when we first exec ../qa/workunits/cephtool/test.sh -t mon_caps --asok-does-not-need-root , it stuck.
                         after modify:
                         exec again, return Permission denied.

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
2015-11-10 02:54:35 -05:00
Sage Weil
8d97771c3c Merge pull request #6084 from liewegas/wip-revert-scrub
Revert "osd: new pool settings: scrub intervals"

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2015-09-28 16:40:31 -04:00
Sage Weil
80b7237e5e qa/workunits/cephtool/test.sh: don't assume crash_replay_interval=45
e.g., it's 5 in teuthology's ceph.conf.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-28 13:13:40 -04:00
Sage Weil
216eef53e9 Revert "osd: new pool settings: scrub intervals"
This reverts commit 30810da4b5.

After some discussion we have decided it is better to build a generic
dictionary in pg_pool_t to store infrequently used per-pool properties.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-25 14:01:19 -04:00
Mykola Golub
30810da4b5 osd: new pool settings: scrub intervals
ceph osd pool set $POOL scrub_min_interval N
 ceph osd pool set $POOL scrub_max_interval N
 ceph osd pool set $POOL deep_scrub_interval N

If N > 0, this value is used for the pool instead of
the corresponding global parameter from the config
(osd_scrub_min_interval, osd_scrub_max_interval or
osd_deep_scrub_interval).

Fixes: #13077
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-09-21 09:08:16 +03:00
Mykola Golub
48db7b16d4 osd: new pool flags: noscrub, nodeep-scrub
This allows to disable periodic scrub on per pool basis.

Fixes: #13076
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-09-21 09:08:16 +03:00
Mykola Golub
b97ae7660e osd: make 'ceph osd pool get' work for all settable pool flags
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-09-21 09:08:16 +03:00
Mykola Golub
10235e3ff3 osd: refactor setting write_fadvise_dontneed pool flag
Handle together with other flags.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-09-21 09:08:16 +03:00
Loic Dachary
21a1e75d8a tests: update to match crushmap validation message
http://tracker.ceph.com/issues/13182 Fixes: #13182

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-21 00:13:08 +02:00
Sage Weil
4a5a5b3705 qa/workunits/cephtool/test.sh: make mds epoch check more tolerant
This can race with an actual mdsmap epoch update for some other
reason.  We just need to make sure the epoch *increased*, not that
it is exactly old + 1.

Fixes: #12991
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 13:51:13 -04:00
Kefu Chai
09464ec6b7 Merge pull request #5570 from dachary/wip-12673-proxy-read
osd: trigger the cache agent after a promotion

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-31 12:04:59 +08:00
Samuel Just
afb4db73cc Merge remote-tracking branch 'origin/wip-sam-proxy-write'
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

Conflicts:
	src/include/ceph_features.h
	src/osd/ReplicatedPG.cc
	src/osd/ReplicatedPG.h
2015-08-19 16:07:30 -07:00
Zhiqiang Wang
61c86a1281 test: change the test_tiering test case accordingly for proxy write
When an object is first created, it's proxied to base tier, need to
change the behavior of the test_tiering test case accordingly.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-08-18 11:25:24 -07:00
Loic Dachary
7924231930 tests: tiering agent and proxy read
Verify that an object promoted to a cache tier because of a proxy read
is evicted as expected.

http://tracker.ceph.com/issues/12673 Refs: #12673

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-08-14 14:31:52 +02:00
Sage Weil
383185bfba mon/OSDMonitor: osd set/unset sortbitwise
Add monitor command to flip the switch on the OSD hobject_t sort
order.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-07 16:23:46 -04:00
Josh Durgin
7d11b6b9d1 Merge remote-tracking branch 'origin/next'
Conflicts:
	src/Makefile-client.am (link rbd to libglobal again)
2015-08-04 18:13:52 -07:00
John Spray
cb51b17043 mon: reject over-large values of max_mds
Fixes: #12222
Signed-off-by: John Spray <john.spray@redhat.com>
2015-07-30 07:12:50 +01:00
Sage Weil
de8a950506 qa/workunits/cephtool/test.sh: escape osd.* and mon.*
Otherwise we get filenames if the glob happens to match something in the
source dir.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-07-23 17:04:53 -04:00
Kefu Chai
017e206cf1 qa/workunits: cephtool: take EOPNOTSUPP as an alias of ENOTSUP
the proble breaks `test_mon_deprecated_commands` on ubuntu precise,
on the python shipped with ubuntu precise, errno.errorcode[95]
evalutes to `EOPNOTSUPP` but not `ENOTSUP`. but these two errnos
are equal in glibc.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-07-19 00:21:23 +08:00
Sage Weil
2746f59da4 Merge remote-tracking branch 'gh/next' 2015-07-16 12:03:58 -04:00
Joao Eduardo Luis
038452e70f mon: Monitor: use 'ceph mon metadata' instead of 'ceph mon_metadata'
'ceph mon_metadata' was added still during this dev cycle, so there is
no need to deprecate it first.

Fixes: #11545

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
2015-07-16 15:54:03 +01:00