Commit Graph

43051 Commits

Author SHA1 Message Date
Haomai Wang
ef824a3da0 Merge pull request #5349 from yuyuyu101/wip-async-fix-21
AsyncConnection: Exit process loop if entering fault
2015-07-28 17:20:44 +08:00
Josh Durgin
37e2b7b85b Merge remote-tracking branch 'origin/next' 2015-07-27 16:42:12 -07:00
Josh Durgin
b2feeb7f32 Merge pull request #5352 from ceph/wip-rbd-help-specs
rbd: cli help and arg parsing fixes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-07-27 15:21:40 -07:00
Gregory Farnum
b6cc488d56 Merge pull request #5336 from ceph/wip-migrate-event-seq
mds: fix val used in inode->last_journaled

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-07-27 12:39:16 +01:00
Ilya Dryomov
17a3e4b969 rbd: rename --object-extents option to --whole-object
--object-extents is a bit confusing - extent is generally something of
a varying length and here the meaning is "diff whole objects".  Rename
it to --whole-object (the name of diff_iterate() parameter).

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-07-27 12:22:04 +03:00
Ilya Dryomov
afbf90d5b5 rbd: du command should take spec as an argument
Change du to take <image-spec> | <snap-spec> as an argument instead of
going through --image option.  The new synopsis is

    (du | disk-usage) [<image-spec> | <snap-spec>]

This is to make it look more like the rest of the commands: the only
other command that takes pool as an argument is ls and it can't really
serve as a prototype for du, because the latter has to work on images
and snapshots as well.

Examples:

    # stats for pool rbd
    $ rbd du
    $ rbd -p rbd du

    # stats for pool foo
    $ rbd -p foo du

    # stats for snapshot mysnap of image baz in pool rbd
    $ rbd du baz@mysnap

    # stats for image bar in pool foo
    $ rbd du foo/bar

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-07-27 12:22:04 +03:00
Ilya Dryomov
7d65bd9bd1 rbd: assorted cli arg parsing fixes
- import-diff needs image-spec, yet OPT_IMPORT_DIFF was in the list of
  commands that don't need imgname

- check for lock id after imgname, so that if imgname isn't specified
  we fail with imgname rather than lock id error message

- error out if locker isn't specified

- move feature-name validity check after imgname checks so that if
  imgname is malformed we fail with imgname rather than feature error
  message

- error out if image-meta key or value isn't specified

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-07-27 12:22:04 +03:00
Ilya Dryomov
b60e144ceb rbd: error out if dest_snapname is specified
No command uses it as of now, but only clone command fails; cp, mv and
import simply ignore it.  Check if it's set and exit with a generic
error message.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-07-27 12:22:04 +03:00
Ilya Dryomov
bbc5c71284 rbd: import doesn't require image-spec arg, ditto for export and path
Mark those as such in help and clarify what image-spec defaults to.

Related, all command args in our man page are enclosed into brackets.
I suppose the reason is that they are optional in the sense that you
can have commands like

    $ rbd clone --pool a --image b --snap -c --dest-pool d --dest e

with no args.  Given that we are trying to push people towards

    $ rbd clone a/b@c d/e

undo that so that real optional arguments can be marked optional.
While at it, add synopsis for each command and use backticks for
denoting commands more consistently.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-07-27 12:22:04 +03:00
Ilya Dryomov
76989cc4ae doc: use spec syntax in rbd docs
Use spec syntax instead of --pool, --image and --snap to hopefully push
people towards the former.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-07-27 12:22:04 +03:00
Vikhyat Umrao
9909388171 rbd: use image-spec and snap-spec in rbd help
This patch changes image-name instances to image-spec and snap-name
instances to snap-spec to try to clarify usage for some commands and
disambiguate the term {image,snap}-name, which has been used to denote
both simple names and compound names (specs).

<image-spec> is [<pool-name>]/<image-name>
<snap-spec> is [<pool-name>]/<image-name>@<snap-name>

This patch also removes duplicate checks for image-name and snap-name.

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
[idryomov@gmail.com: some commands take either image-spec or snap-spec,
other fixes, formatting, changelog]
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-07-27 12:22:04 +03:00
Haomai Wang
3482e689ee AsyncConnection: Exit process loop if entering fault
"fault" will transmit state to exception state or STATE_CONNECTING, all
transmitted states don't need to check right now.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-07-27 14:02:02 +08:00
Haomai Wang
ba4d223e44 Merge pull request #5342 from tchaikov/wip-fix-perf-local-on-arm
test/perf_local: disable tests on unsupported archs

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-07-25 15:19:50 +08:00
Kefu Chai
554c982d85 test/perf_local: disable tests on unsupported archs
* maybe we can have div32 tests on aarch64, but i don't
  think "udiv|sdiv" supports 64bits numerator. probably
  we can use float divde for the benchmark...
* disable cpuid test on non-intel archs.

Fixes: #12453
Reported-by: Tom Deneau <tom.deneau@amd.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-07-25 10:10:34 +08:00
Loic Dachary
3f122275df Merge pull request #5316 from shylesh/bugfix
mon: ceph osd map shows NONE when an osd is missing

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-07-24 16:29:35 +02:00
John Spray
79da14b2cd Merge pull request #5322 from majianpeng/mds-log
mmds/MDLog: No make sense set offset for LogEvent in _start_entry.

Reviewed-by: John Spray <john.spray@redhat.com>
2015-07-24 09:43:22 +01:00
John Spray
992d959e23 mds: fix val used in inode->last_journaled
This was getting assigned with LogEvent::get_start_offset
on an uncommitted LogEvent, which is junk.  During replay
last_journaled is compared with the metablob's event_seq,
so that's what should be used here.

This change just from code inspection -- haven't seen this
manifest as an actual misbehaviour.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-07-24 09:37:15 +01:00
Loic Dachary
dedda6245c Merge pull request #5330 from liewegas/wip-cephtool-test
qa/workunits/cephtool/test.sh: escape osd.* and mon.*

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-07-24 08:46:40 +02: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
John Spray
f7bda9567d Merge branch 'next' 2015-07-23 20:26:51 +01:00
David Zafman
1cf550596e Merge pull request #5327 from athanatos/wip-12223
WBThrottle::clear_object: signal if we cleared an object

Reviewed-by: David Zafman <dzafman@redhat.com>
2015-07-23 12:16:09 -07:00
David Zafman
5a9cbf1da9 Merge pull request #5328 from athanatos/wip-12263
ReplicatedPG::finish_promote: do not prefill new_clones

Reviewed-by: David Zafman <dzafman@redhat.com>
2015-07-23 12:13:00 -07:00
Samuel Just
8447b08d60 WBThrottle::clear_object: signal if we cleared an object
Fixes: #12223
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-07-23 12:11:15 -07:00
David Zafman
2869a8367a Merge pull request #5189 from athanatos/wip-recovery-defaults
config_opts: turn down default recovery tunables

Reviewed-by: David Zafman <dzafman@redhat.com>
2015-07-23 11:47:37 -07:00
David Zafman
6159c6796e Merge pull request #5329 from athanatos/wip-8193
test/librados/tier.cc: we can exceed the hitset limit while backfilling

Reviewed-by: David Zafman <dzafman@redhat.com>
2015-07-23 11:46:17 -07:00
John Spray
f753c109fc Merge pull request #5323 from ceph/wip-12426
mon: fix checks on mds add_data_pool

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-07-23 19:43:53 +01:00
Samuel Just
dd4f722a1e Merge pull request #4982 from branch-predictor/bp-lighter-rwlocks
common/RWLock: allow disabling read/write lock counts

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-07-23 11:02:48 -07:00
Samuel Just
fd3c4dcc1d Merge pull request #5152 from branch-predictor/bp-rados-aio-overrun
tools: fix race condition in seq/rand bench

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-07-23 11:00:01 -07:00
Samuel Just
e7c394ff6a Merge pull request #5093 from guangyy/wip-12162
osd - pg_interval_t::check_new_interval should not rely on pool.min_size to determine if the PG was active

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-07-23 10:49:00 -07:00
Samuel Just
cd2d7d086f ceph-helpers.sh: don't test the osd_max_backfills value
This isn't a very meaningful assert since the default could
easily change.

Signed-off-by: Samuel Just <sjust@redhat.com>
2015-07-23 10:41:45 -07:00
Ken Dreyer
b5fac3d694 Merge pull request #5325 from vumrao/wip-vumrao-10927
rgw: fix radosgw start-up script.

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-23 10:11:34 -06:00
Yehuda Sadeh
17eefb4e14 Merge pull request #5308 from oritwas/fix-compilation-warnings
Fix "was hidden" compilation warnings

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-07-23 09:09:11 -07:00
Orit Wasserman
bc348f6b71 Fix "was hidden" compilation warnings
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2015-07-23 17:38:23 +02:00
Vikhyat Umrao
c83542296a rgw: fix radosgw start-up script.
radosgw init script is unable to start radosgw daemon.
as it is relies on requiretty being disabled.
once init script start this daemon with sudo it fails
to start the daemon.

changing 'sudo' to 'su', it will fix this issue and
will also help running radosgw daemon with our new
"ceph" UID project.

Fixes: #10927

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
2015-07-23 20:23:03 +05:30
Sage Weil
3c57f7a9b2 Merge pull request #5326 from tweenk/docs-improvements
Documentation for a few objects

Reviewed-by: Sage Weil <sage@redhat.com>
2015-07-23 10:04:52 -04:00
Ken Dreyer
b8671fd176 Merge pull request #5261 from SUSE/wip-drop-py-requires
ceph.spec.in: drop SUSE-specific %py_requires macro

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-23 07:48:12 -06:00
Ken Dreyer
fbbed3afaa Merge pull request #5263 from SUSE/wip-apache-not-required
ceph.spec.in: remove SUSE-specific apache2-mod_fcgid dependency

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-23 07:46:27 -06:00
Krzysztof Kosiński
2513ba750f docs: Document md_config_obs_t.
Signed-off-by: Krzysztof Kosiński <krzysztof.kosinski@intel.com>
2015-07-23 15:20:20 +02:00
Krzysztof Kosiński
af0d1ab6e2 docs: Document the ThreadPool and WorkQueue classes.
Signed-off-by: Krzysztof Kosiński <krzysztof.kosinski@intel.com>
2015-07-23 15:19:52 +02:00
Krzysztof Kosiński
799fd9f7dd docs: Document the Finisher class.
Signed-off-by: Krzysztof Kosiński <krzysztof.kosinski@intel.com>
2015-07-23 15:18:52 +02:00
John Spray
329741ec23 mon: fix checks on mds add_data_pool
Use same _check_pool helper as during fs creation.

Fixes: #12426

Signed-off-by: John Spray <john.spray@redhat.com>
2015-07-23 14:08:33 +01:00
John Spray
29ea23c3ff Merge pull request #5324 from ceph/wip-12355
mds: fix crash while stopping rank

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-07-23 14:04:20 +01:00
Sage Weil
d4a956c383 Merge pull request #5317 from ceph/wip-quota-doc
doc/cephfs/quota: simple doc

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Travis Rhoden <trhoden@redhat.com>
2015-07-23 08:37:19 -04:00
Sage Weil
8b1df960e2 doc/cephfs/quota: simple doc
Signed-off-by: Sage Weil <sage@redhat.com>
2015-07-23 08:35:35 -04:00
John Spray
c8bdf1b761 mds: fix crash while stopping rank
trim() was broken in:
8a91daae mds: fix mds crash when mds_max_log_events smaller

When doing a final trim in shutdown we need to trim everything,
not just all but the last segment.  The previous change's intent
was to prevent badness when mds_log_max_events was too small: accomplish
the same thing here by clamping the value to something sane.

Fixes: #12355

Signed-off-by: John Spray <john.spray@redhat.com>
2015-07-23 10:48:18 +01:00
Jianpeng Ma
cb38aa1d6d mmds/MDLog: No make sense set offset for LogEvent in _start_entry.
For offset of LogEvent only determine in submit_thread. So in
_start_entry it's no make sense set.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-07-23 11:09:08 +08:00
Sage Weil
0fa6e51979 Merge pull request #5305 from ceph/wip-12417
auth: check return value of keyring->get_secret

Reviewed-by: Sage Weil <sage@redhat.com>
2015-07-22 11:38:02 -04:00
Haomai Wang
f0c9fde863 Merge pull request #5300 from yuyuyu101/wip-async-fix-20
AsyncConnection: Fix local message dispatch lack of source name
2015-07-22 23:14:56 +08:00
Shylesh Kumar
4d030302ea mon: ceph osd map shows NONE when an osd is missing
Signed-off-by: Shylesh Kumar <shmohan@redhat.com>
2015-07-22 20:19:26 +05:30
Kefu Chai
f4bb3777a9 Merge pull request #5314 from dachary/wip-12419-rule-create-erasure
tests: robust test for the pool create crush map test

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-07-22 19:26:45 +08:00