Commit Graph

41714 Commits

Author SHA1 Message Date
Yehuda Sadeh
4be8e49e38 Merge pull request #4617 from aakso/wip-11367-pki-token-expire
rgw: always check if token is expired

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-05-21 14:09:38 -07:00
Yehuda Sadeh
98cdf03363 Merge pull request #4391 from nilamdyuti/wip-doc-ceph-object-gateway
doc: Removes references to s3gw.fcgi in simple gateway configuration file...

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-05-21 13:00:20 -04:00
Dan Mick
783fdc7c3e Merge pull request #4517 from ceph/wip-11388-debian-argparse
#11388 debian: move ceph_argparse into ceph-common

Reviewed-by: Dan Mick <dmick@redhat.com>
2015-05-20 14:54:16 -07:00
Ilya Dryomov
8190f44f07 Merge pull request #4721 from ceph/wip-fix-concurrent.sh
Fix ceph.conf path in concurrent.sh - krbd qa suite

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2015-05-20 20:54:55 +03:00
Ken Dreyer
110608e5bd debian: move ceph_argparse into ceph-common
Prior to this commit, if a user installed the "ceph-common" Debian
package without installing "ceph", then /usr/bin/ceph would crash
because it was missing the ceph_argparse library.

Ship the ceph_argparse library in "ceph-common" instead of "ceph". (This
was the intention of the original commit that moved argparse to "ceph",
2a23eac549)

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

Reported-by: Jens Rosenboom <j.rosenboom@x-ion.de>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2015-05-20 11:29:04 -06:00
Kefu Chai
8c65e2af29 Merge pull request #4720 from athanatos/wip-clarify-DBObjectMap-sync
DBObjectMap::sync: add comment clarifying locking

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-05-20 21:28:28 +08:00
Kefu Chai
4e272e5eb1 Merge pull request #3946 from tchaikov/randomize-scrub-time
osd: Randomize scrub time

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-05-20 21:21:13 +08:00
Kefu Chai
6344fc8393 osd: use another name for randomize scrub option
s/osd_scrub_interval_limit/osd_scrub_interval_randomize_ratio/

Fixes: #10973
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-20 18:23:21 +08:00
Kefu Chai
5e44040e85 osd: randomize scrub times to avoid scrub wave
- to avoid the scrub wave when the osd_scrub_max_interval reaches in a
  high-load OSD, the scrub time is randomized.
- extract scrub_load_below_threshold() out of scrub_should_schedule()
- schedule an automatic scrub job at a time which is uniformly distributed
  over [now+osd_scrub_min_interval,
        now+osd_scrub_min_interval*(1+osd_scrub_time_limit]. before
  this change this sort of scrubs will be performed once the hard interval
  is end or system load is below the threshold, but with this change, the
  jobs will be performed as long as the load is low or the interval of
  the scheduled scrubs is longer than conf.osd_scrub_max_interval. all
  automatic jobs should be performed in the configured time period, otherwise
  they are postponed.
- the requested scrub job will be scheduled right away, before this change
  it is queued with the timestamp of `now` and postponed after
  osd_scrub_min_interval.

Fixes: #10973
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-20 18:23:21 +08:00
Kefu Chai
0f7f35670f osd: use __func__ in log messages
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-20 18:23:21 +08:00
Kefu Chai
2ab0e606df osd: simplify OSD::scrub_load_below_threshold() a little bit
avoid unnecessary comparison

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-20 18:23:21 +08:00
Haomai Wang
8ec7303b95 Merge pull request #4691 from varadakari/wip-kvs-objheader
KeyValueStore: optimize the object header writes

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-20 16:29:21 +08:00
Vasu Kulkarni
f9e5b68b23 qa: unbreak concurrent.sh workunit
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2015-05-19 15:55:05 -04:00
Yan, Zheng
e585ddf43f Merge pull request #4658 from ceph/wip-11481
#11481: MDS resilience to weird mdsmaps
2015-05-19 16:03:52 +08:00
Josh Durgin
1b758c9945 Merge pull request #4722 from ceph/wip-rbd-xfstests-20150518
rbd: expunge xfstests generic/078

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-05-18 23:13:35 -07:00
Douglas Fuller
bf40b9b553 rbd: expunged xfstests generic/078
This tests RENAME_WHITEOUT, which was enabled for xfs in kernel commit
7dcf5c3e4527cfa2807567b00387cf2ed5e07f00. At first execution, it throws a BUG.
Subsequent executions appear to work correctly. This issue manifests for disks
and RBD instances.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
2015-05-18 17:37:00 -07:00
David Zafman
87433dabdd Merge pull request #4705 from stiopaa1/exit
cryptic error message in ceph interactive mode

Reviewed-by: David Zafman <dzafman@redhat.com>
2015-05-18 13:27:14 -07:00
Samuel Just
2eca53682f DBObjectMap::sync: add comment clarifying locking
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-05-18 12:29:05 -07:00
Yan, Zheng
765ddaeaa0 Merge pull request #4715 from ceph/wip-11641
mds: fix handling missing mydir dirfrag
2015-05-19 00:28:01 +08:00
John Spray
9ed491989a mds: fix handling missing mydir dirfrag
This was broken by 96992466 aka "mds: handle missing mydir dirfrag"

The previous code was mistakenly treating a not-yet-loaded
dirfrag as a non-existent dirfrag, resulting in
inconsistent fragstats even when no objects had
actually been lost.

Fixes: #11641
Signed-off-by: John Spray <john.spray@redhat.com>
2015-05-18 16:15:07 +01:00
Haomai Wang
2863163cd5 Merge pull request #4693 from varadakari/wip-kvdb-prefix
KeyValueStore: Fix the prefix comparion to avoid object leaks.

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-18 21:58:10 +08:00
Haomai Wang
0a087c1dae Merge pull request #4692 from varadakari/wip-kvs-iterator
wip-kvs-iterator

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-18 21:56:11 +08:00
Kefu Chai
c1f4b7a257 Merge pull request #4703 from dachary/wip-make-check-verbose
tests: reduce make check verbosity

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-05-18 10:14:29 +08:00
Loic Dachary
e4ca4685e0 tests: reduce make check verbosity
Move check-local scripts

   src/test/run-cli-tests
   encode-decode-non-regression.sh
   test/encoding/readable.sh

to check_SCRIPTS. Their output is captured in .log file when running
with a recent automake. This reduces the output of make check by an
order of magnitude.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-18 00:41:16 +02:00
Loic Dachary
a0eac3e48c Merge pull request #4711 from dachary/wip-ceph-detect-init
ceph-detect-init typo

Reviewed-by: Michal Jarzabek <stiopa@gmail.com>
2015-05-17 22:55:31 +02:00
Loic Dachary
64f584a8e7 ceph-detect-init: fix pep8 extra space
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 21:30:54 +02:00
Loic Dachary
855aeee697 ceph-detect-init: run-tox.sh always succeeds
Because of the | grep, the status of tox is no longer the status of
run-tox.sh and errors are not reported as they should.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 21:29:25 +02:00
Kefu Chai
8e7dfcd29b Merge pull request #4704 from dachary/wip-ceph-helpers
{mon,osd}-test-helpers.sh are deprecated

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-05-17 22:25:39 +08:00
Michal Jarzabek
3cf3ac39f1 cryptic error message in ceph interactive mode
Fixes: #11459
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2015-05-17 15:22:44 +01:00
Loic Dachary
7e5336bfa5 Merge pull request #4706 from stiopaa1/cephdetectinit
ceph_detect_init: added linux mint

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 15:57:42 +02:00
Michal Jarzabek
d688b0c39d ceph_detect_init: added linux mint
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2015-05-17 12:50:57 +01:00
Loic Dachary
e5564a87eb tests: {mon,osd}-test-helpers.sh are deprecated
Remove the helpers because they are not used any longer. They have been
deprecated by ceph-helpers.sh

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 13:31:25 +02:00
Loic Dachary
ae2d489bac tests: ceph-helpers.sh remove redundant setup in main
And add setup/teardown in tests that do not have it.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 13:31:25 +02:00
Loic Dachary
e9859838ea tests: test/mon/mon-handle-forward.sh uses ceph-helpers.sh
Use ceph-helpers.sh instead of  mon/mon-test-helpers.sh.

  * modifying the .asok and .log names to match the ceph-helpers.sh
    conventions

  * use explicit ports 7300 and 7301 instead of +1 so that grep
    will show that 7301 is used. This reduces the odds of a
    port collision when looking for a port that's not already
    used by an existing test.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 13:31:25 +02:00
Loic Dachary
1209786555 tests: test/mon/osd-pool-create.sh uses ceph-helpers.sh
Use ceph-helpers.sh instead of  mon/mon-test-helpers.sh.

  * The expect_false() helper is replaced by a ! statement which is
    simpler and has the same effect.

  * modifying the .asok and .log names to match the ceph-helpers.sh
    conventions

  * trim the --public-addr argument from the run_mon call

  * add || return 1 after run_mon where missing

  * add || return 1 to all commands in TEST_no_pool_delete

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 13:31:25 +02:00
Loic Dachary
88e954b052 tests: test/osd/osd-bench.sh uses ceph-helpers.sh
Remove useless inclusion of osd/osd-test-helpers.sh

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 13:31:25 +02:00
Loic Dachary
e3f03d83d6 tests: test/osd/osd-config.sh uses ceph-helpers.sh
The ceph-helpers.sh was already included, along with
mon/mon-test-helpers.sh and osd/osd-test-helpers.sh which creates
confusion.

  * modifying the .asok and .log names to match the ceph-helpers.sh
    conventions

  * trim the --public-addr argument from the run_mon call

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 13:31:25 +02:00
Loic Dachary
0f56553259 tests: test/osd/osd-copy-from.sh uses ceph-helpers.sh
The ceph-helpers.sh was already included, along with
mon/mon-test-helpers.sh and osd/osd-test-helpers.sh which creates
confusion.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 13:31:25 +02:00
Loic Dachary
c693ec1081 tests: test/vstart_wrapper.sh uses ceph-helpers.sh
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 13:31:25 +02:00
Loic Dachary
4a26ca2efe tests: test/mon/misc.sh uses ceph-helpers.sh
Fix grep that assume the pool has id 0, because it may be different
when rbd is redefined to have less PG by the run_mon function.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 13:31:25 +02:00
Loic Dachary
aa99929e06 tests: test/erasure-code/test-erasure-code.sh uses ceph-helpers.sh
The ceph-helpers.sh was already included, along with
mon/mon-test-helpers.sh and osd/osd-test-helpers.sh which creates
confusion.

  * replace check_osd_status with wait_for_osd

  * modifying the .asok and .log names to match the ceph-helpers.sh
    conventions

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 13:31:25 +02:00
Loic Dachary
7aca4701a4 tests: test/mon/osd-crush.sh uses ceph-helpers.sh
It is just a conversion and the behavior is not changed. It involves:

  * calling run_mon from inside each test instead of doing it in run

  * modifying the .asok and .log names to match the ceph-helpers.sh
    conventions

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 13:31:21 +02:00
Loic Dachary
f3cb870b9e tests: test/mon/osd-erasure-code-profile.sh uses ceph-helpers.sh
Instead of using mon-test-helpers.sh, primarily because the kill_daemon
function implemented in mon-test-helpers.sh is not as good as
ceph-helpers.sh.

Instead of having tests that share the same monitor, each test now runs
on a fresh monitor. The test writer no longer has to worry that it will
be re-using the pool or profile from a previous test. That causes
problems that are difficult to diagnose and the overhead of running a
new monitor is not so high.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 12:33:05 +02:00
Loic Dachary
66dcda9a58 tests: kill mon-test-helpers.sh call_TEST_functions
Remove call_TEST_functions because it is too complex and rarely used.
Replace the two instances where it was used by a few lines doing the
same thing.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 12:33:05 +02:00
Loic Dachary
ea61c8ab5a tests: ceph-helpers.sh do not hardcode id a in run_mon
Fix hardcoding of id a in the run_mon function. The directory
in which the mon data is stored must be a sub-directory of the
directory given in argument.

If mon_initial_members is set, the rbd pool cannot be redefined, which
is ok because this is rare and it's only an optimization to reduce the
number of PG.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 12:33:05 +02:00
Loic Dachary
b9447bce9a tests: ceph-helpers.sh shows ceph report if not clean
Instead of just pg dump and health detail, the wait_for_clean
function displays ceph report when it times out, to help figure out what
caused it.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 12:33:05 +02:00
Loic Dachary
de20f61529 tests: ceph-helpers.sh implement wait_for_osd
The wait_for_osd to wait for an osd to go up and down is needed
internally, after running an osd. Move the inline snippet from run_osd
into a function so that it can be used by scripts as well.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-17 12:10:47 +02:00
Yehuda Sadeh
7ee4a04c2b Merge pull request #4436 from BCLibCoop/bclibcoop/rgw-content_length
rgw: improve content-length env var handling

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-05-15 14:47:35 -07:00
Sage Weil
ccd54c6574 Merge pull request #4662 from dachary/wip-11359-tier-tests
tests: more robust tiering agent tests

Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-15 13:36:31 -07:00
Haomai Wang
361f766c3b Merge pull request #4684 from xinxinsh/wip-fiemap-fix
do not return non-exist extents when doing sparse read

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-05-16 03:19:24 +08:00