]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agolibrbd: prevent race condition between resize requests 5544/head
Jason Dillaman [Tue, 11 Aug 2015 13:26:33 +0000 (09:26 -0400)]
librbd: prevent race condition between resize requests

It was possible that the same resize request could be sent twice
if a completed resize op started a newly created resize op while
it was also being concurrently started by another thread.

Fixes: #12664
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #5492 from ceph/wip-vxattr-setall
Yan, Zheng [Fri, 7 Aug 2015 02:04:32 +0000 (10:04 +0800)]
Merge pull request #5492 from ceph/wip-vxattr-setall

mds: fix setting whole layout in one vxattr

9 years agoqa: add fs layout case for stripe_size decrease 5492/head
John Spray [Thu, 6 Aug 2015 13:59:36 +0000 (14:59 +0100)]
qa: add fs layout case for stripe_size decrease

The case fixed by commit:
 mds: fix setting whole layout in one vxattr

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agomds: fix setting whole layout in one vxattr 5491/head
John Spray [Thu, 6 Aug 2015 12:10:08 +0000 (13:10 +0100)]
mds: fix setting whole layout in one vxattr

Previously we were validating the layout
after setting each field, so even when
setting multiple fields in one go (to
something valid) the intermediate states
could be invalid and cause a bogus EINVAL.

For example try setting object_size and stripe_unit
both to 2M in one go.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoRevert "rbd: remove dependency on non-ABI controlled CephContext"
Jason Dillaman [Fri, 31 Jul 2015 17:06:33 +0000 (13:06 -0400)]
Revert "rbd: remove dependency on non-ABI controlled CephContext"

This reverts commit fa78739933d7b9501116a12a4fbfd58b5ca99cdb.
Original approach broke krbd map/unmap functions and did not fully
address ABI issues.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5397 from ceph/wip-12222
Sage Weil [Mon, 3 Aug 2015 19:15:51 +0000 (15:15 -0400)]
Merge pull request #5397 from ceph/wip-12222

mon: reject over-large values of max_mds

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #5425 from ceph/wip-12479-next
Josh Durgin [Thu, 30 Jul 2015 23:26:51 +0000 (16:26 -0700)]
Merge pull request #5425 from ceph/wip-12479-next

librbd: test crash during client upgrade suite

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5426 from ceph/wip-12383-next
Josh Durgin [Thu, 30 Jul 2015 21:08:32 +0000 (14:08 -0700)]
Merge pull request #5426 from ceph/wip-12383-next

rbd: remove dependency on non-ABI controlled CephContext

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agolockdep: allow lockdep to be dynamically enabled/disabled 5425/head
Jason Dillaman [Wed, 29 Jul 2015 16:46:24 +0000 (12:46 -0400)]
lockdep: allow lockdep to be dynamically enabled/disabled

librbd test cases attempt to enable lockdep coverage via the librados
API.  Use a configuration observer to register/unregister lockdep
support.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: librbd API test cannot use private md_config_t struct
Jason Dillaman [Tue, 28 Jul 2015 18:23:14 +0000 (14:23 -0400)]
tests: librbd API test cannot use private md_config_t struct

Remove all depencencies on md_config_t and instead use librados API
methods to get/set configuration values.

Fixes: #12479
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrados_test_stub: implement conf get/set API methods
Jason Dillaman [Thu, 30 Jul 2015 13:00:57 +0000 (09:00 -0400)]
librados_test_stub: implement conf get/set API methods

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agomon: reject over-large values of max_mds 5397/head
John Spray [Wed, 29 Jul 2015 09:05:43 +0000 (10:05 +0100)]
mon: reject over-large values of max_mds

Fixes: #12222
Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoLog::reopen_log_file: take m_flush_mutex
Samuel Just [Fri, 24 Jul 2015 22:38:18 +0000 (15:38 -0700)]
Log::reopen_log_file: take m_flush_mutex

Otherwise, _flush() might continue to write to m_fd after it's closed.
This might cause log data to go to a data object if the filestore then
reuses the fd during that time.

Fixes: #12465
Backport: firefly, hammer
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 8778ab3a1ced7fab07662248af0c773df759653d)

9 years agorbd: remove dependency on non-ABI controlled CephContext 5426/head
Jason Dillaman [Tue, 28 Jul 2015 19:27:24 +0000 (15:27 -0400)]
rbd: remove dependency on non-ABI controlled CephContext

The rbd CLI tool no longer attempts to initialize a CephContext
and pass said context to librados since it's possible that the
structure will not be ABI compatible between rbd and librados.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agocrypto: use NSS_InitContext/NSS_ShutdownContex to avoid memory leak
Jason Dillaman [Tue, 28 Jul 2015 17:14:29 +0000 (13:14 -0400)]
crypto: use NSS_InitContext/NSS_ShutdownContex to avoid memory leak

Switched to context-aware NSS init/shutdown functions to avoid conflicts
with parent application.  Use a reference counter to properly shutdown the
NSS crypto library when the last CephContext is destroyed.  This avoids
memory leaks with the NSS library from users of librados.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #5350 from ceph/wip-pgls-filter-enc
Sage Weil [Tue, 28 Jul 2015 13:12:32 +0000 (09:12 -0400)]
Merge pull request #5350 from ceph/wip-pgls-filter-enc

osdc: fix pgls_filter op encoding

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5352 from ceph/wip-rbd-help-specs
Josh Durgin [Mon, 27 Jul 2015 22:21:40 +0000 (15:21 -0700)]
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>
9 years agorbd: rename --object-extents option to --whole-object 5352/head
Ilya Dryomov [Thu, 23 Jul 2015 12:49:31 +0000 (15:49 +0300)]
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>
9 years agorbd: du command should take spec as an argument
Ilya Dryomov [Thu, 23 Jul 2015 12:55:47 +0000 (15:55 +0300)]
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>
9 years agorbd: assorted cli arg parsing fixes
Ilya Dryomov [Tue, 21 Jul 2015 15:11:20 +0000 (18:11 +0300)]
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>
9 years agorbd: error out if dest_snapname is specified
Ilya Dryomov [Tue, 21 Jul 2015 14:55:55 +0000 (17:55 +0300)]
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>
9 years agorbd: import doesn't require image-spec arg, ditto for export and path
Ilya Dryomov [Mon, 20 Jul 2015 14:22:54 +0000 (17:22 +0300)]
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>
9 years agodoc: use spec syntax in rbd docs
Ilya Dryomov [Fri, 17 Jul 2015 09:41:29 +0000 (12:41 +0300)]
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>
9 years agorbd: use image-spec and snap-spec in rbd help
Vikhyat Umrao [Thu, 16 Jul 2015 16:09:54 +0000 (21:39 +0530)]
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>
9 years agoosdc: fix pgls_filter op encoding 5350/head
John Spray [Fri, 24 Jul 2015 13:46:49 +0000 (14:46 +0100)]
osdc: fix pgls_filter op encoding

This was broken with respect to the OSD's expected order
of decoding.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #5323 from ceph/wip-12426
John Spray [Thu, 23 Jul 2015 18:43:53 +0000 (19:43 +0100)]
Merge pull request #5323 from ceph/wip-12426

mon: fix checks on mds add_data_pool

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agomon: fix checks on mds add_data_pool 5323/head
John Spray [Thu, 23 Jul 2015 09:15:56 +0000 (10:15 +0100)]
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>
10 years agoMerge pull request #5324 from ceph/wip-12355
John Spray [Thu, 23 Jul 2015 13:04:20 +0000 (14:04 +0100)]
Merge pull request #5324 from ceph/wip-12355

mds: fix crash while stopping rank

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agomds: fix crash while stopping rank 5321/head 5324/head
John Spray [Wed, 22 Jul 2015 20:57:33 +0000 (21:57 +0100)]
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>
10 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Thu, 16 Jul 2015 16:03:58 +0000 (12:03 -0400)]
Merge remote-tracking branch 'gh/next'

10 years agoMerge branch 'wip-mon-scrub'
Joao Eduardo Luis [Thu, 16 Jul 2015 15:46:32 +0000 (16:46 +0100)]
Merge branch 'wip-mon-scrub'

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge branch 'wip-11786'
Joao Eduardo Luis [Thu, 16 Jul 2015 15:44:22 +0000 (16:44 +0100)]
Merge branch 'wip-11786'

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge branch 'wip-11470'
Joao Eduardo Luis [Thu, 16 Jul 2015 15:21:18 +0000 (16:21 +0100)]
Merge branch 'wip-11470'

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agomon: PaxosService: call post_refresh() instead of post_paxos_update()
Joao Eduardo Luis [Fri, 12 Jun 2015 18:21:10 +0000 (19:21 +0100)]
mon: PaxosService: call post_refresh() instead of post_paxos_update()

Whenever the monitor finishes committing a proposal, we call
Monitor::refresh_from_paxos() to nudge the services to refresh.  Once
all services have refreshed, we would then call each services
post_paxos_update().

However, due to an unfortunate, non-critical bug, some services (mainly
the LogMonitor) could have messages pending in their
'waiting_for_finished_proposal' callback queue [1], and we need to nudge
those callbacks.

This patch adds a new step during the refresh phase: instead of calling
directly the service's post_paxos_update(), we introduce a
PaxosService::post_refresh() which will call the services
post_paxos_update() function first and then nudge those callbacks when
appropriate.

[1] - Given the monitor will send MLog messages to itself, and given the
service is not readable before its initial state is proposed and
committed, some of the initial MLog's would be stuck waiting for the
proposal to finish.  However, by design, we only nudge those message's
callbacks when an election finishes or, if the leader, when the proposal
finishes.  On peons, however, we would only nudge those callbacks if an
election happened to be triggered, hence the need for an alternate path
to retry any message waiting for the initial proposal to finish.

Fixes: #11470
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
10 years agoMerge branch 'wip-11545'
Joao Eduardo Luis [Thu, 16 Jul 2015 15:07:11 +0000 (16:07 +0100)]
Merge branch 'wip-11545'

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #5251 from ceph/wip-12021-next
Sage Weil [Thu, 16 Jul 2015 15:05:04 +0000 (11:05 -0400)]
Merge pull request #5251 from ceph/wip-12021-next

OSDMonitor: allow addition of cache pool with non-empty snaps with co…

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #5188 from athanatos/wip-11687
Sage Weil [Thu, 16 Jul 2015 15:03:18 +0000 (11:03 -0400)]
Merge pull request #5188 from athanatos/wip-11687

PG::find_best_info: ignore info.les for incomplete peer

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agomon: Monitor: use 'ceph mon metadata' instead of 'ceph mon_metadata'
Joao Eduardo Luis [Tue, 12 May 2015 13:59:11 +0000 (14:59 +0100)]
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>
10 years agoMerge pull request #5238 from tweenk/out-of-tree-build-fix
Kefu Chai [Thu, 16 Jul 2015 14:03:52 +0000 (22:03 +0800)]
Merge pull request #5238 from tweenk/out-of-tree-build-fix

Makefile: fix out-of-tree build.

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #5256 from ceph/wip-ftbfs-i386-cls-cephfs
John Spray [Thu, 16 Jul 2015 13:42:49 +0000 (14:42 +0100)]
Merge pull request #5256 from ceph/wip-ftbfs-i386-cls-cephfs

fix the FTBFS on i386 due to libcls_cephfs

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #5255 from hjwsm1989/fix-pgmonitor
Kefu Chai [Thu, 16 Jul 2015 13:15:03 +0000 (21:15 +0800)]
Merge pull request #5255 from hjwsm1989/fix-pgmonitor

mon/PGMonitor: use poolname reference instead of get it in osdmap

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agomon: Monitor: use 'ceph mon sync force' instead of 'ceph sync force'
Joao Eduardo Luis [Fri, 8 May 2015 23:14:40 +0000 (00:14 +0100)]
mon: Monitor: use 'ceph mon sync force' instead of 'ceph sync force'

Makes it easier to identify the command as being related with the
monitor instead of cluster-wide.

This entails adding an exception to module 'mon' in order to have this
command handled by the Monitor class instead of MonmapMonitor (which is
the one traditionally handling 'mon' module commands).

Fixes: #11545
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
10 years agomon: Monitor: use 'ceph mon scrub' instead of 'ceph scrub'
Joao Eduardo Luis [Fri, 8 May 2015 23:11:20 +0000 (00:11 +0100)]
mon: Monitor: use 'ceph mon scrub' instead of 'ceph scrub'

Makes it easier to identify the command as being related with the
monitor instead of cluster-wide.

This entails adding an exception to module 'mon' in order to have this
command handled by the Monitor class instead of MonmapMonitor (which is
the one traditionally handling 'mon' module commands).

Fixes: #11545
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
10 years agomon: Monitor: use 'ceph mon compact' instead of 'ceph compact'
Joao Eduardo Luis [Fri, 8 May 2015 23:06:35 +0000 (00:06 +0100)]
mon: Monitor: use 'ceph mon compact' instead of 'ceph compact'

Makes it easier to identify the command as being related with the
monitor instead of cluster-wide.

This entails adding an exception to module 'mon' in order to have this
command handled by the Monitor class instead of MonmapMonitor (which is
the one traditionally handling 'mon' module commands).

Fixes: #11545
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
10 years agoqa/workunits: cephtool: test deprecated commands
Joao Eduardo Luis [Fri, 8 May 2015 18:50:35 +0000 (19:50 +0100)]
qa/workunits: cephtool: test deprecated commands

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
10 years agoPendingReleaseNotes: note deprecation of commands
Joao Eduardo Luis [Fri, 8 May 2015 23:27:24 +0000 (00:27 +0100)]
PendingReleaseNotes: note deprecation of commands

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
10 years agomon: MonCommands.h: DEPRECATE 'ceph sync force'
Joao Eduardo Luis [Fri, 8 May 2015 18:15:03 +0000 (19:15 +0100)]
mon: MonCommands.h: DEPRECATE 'ceph sync force'

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
10 years agomon: MonCommands.h: DEPRECATE 'ceph compact'
Joao Eduardo Luis [Fri, 8 May 2015 18:14:42 +0000 (19:14 +0100)]
mon: MonCommands.h: DEPRECATE 'ceph compact'

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
10 years agomon: MonCommands.h: DEPRECATE 'ceph scrub'
Joao Eduardo Luis [Fri, 8 May 2015 18:14:16 +0000 (19:14 +0100)]
mon: MonCommands.h: DEPRECATE 'ceph scrub'

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
10 years agomon: Monitor: allow deprecating commands and debugging as obsolete
Joao Eduardo Luis [Fri, 8 May 2015 18:09:03 +0000 (19:09 +0100)]
mon: Monitor: allow deprecating commands and debugging as obsolete

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
10 years agomon: Monitor: add is_noforward() helper to MonCommand
Joao Eduardo Luis [Fri, 8 May 2015 18:05:00 +0000 (19:05 +0100)]
mon: Monitor: add is_noforward() helper to MonCommand

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
10 years agomon: Monitor: add support to have OBSOLETE commands
Joao Eduardo Luis [Fri, 8 May 2015 18:02:58 +0000 (19:02 +0100)]
mon: Monitor: add support to have OBSOLETE commands

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
10 years agomon: MonCommand: don't match help string in is_compat()
Joao Eduardo Luis [Fri, 8 May 2015 15:29:23 +0000 (16:29 +0100)]
mon: MonCommand: don't match help string in is_compat()

Otherwise it's virtually impossible to change a command's help string
without triggering a mismatch with the leader's command set.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
10 years agomon: MonCommands: add NOFORWARD to 'ceph sync force'
Joao Eduardo Luis [Fri, 8 May 2015 15:00:35 +0000 (16:00 +0100)]
mon: MonCommands: add NOFORWARD to 'ceph sync force'

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
10 years agomon: MonCommand: add FLAG_NONE
Joao Eduardo Luis [Fri, 8 May 2015 14:57:08 +0000 (15:57 +0100)]
mon: MonCommand: add FLAG_NONE

Instead of passing '0' for commands without flags, pass FLAG_NONE
instead.  It's prettier and more obvious -- and it only costs 64 bits.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
10 years agomon: MonCommand: have flags as uint32_t instead of enum
Joao Eduardo Luis [Fri, 8 May 2015 14:53:31 +0000 (15:53 +0100)]
mon: MonCommand: have flags as uint32_t instead of enum

Makes much more sense if we're OR'ing flags.  Or not as weird.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
10 years agomon: MonCommands: accept FLAG(f) instead of 'f' in command sig
Joao Eduardo Luis [Fri, 8 May 2015 14:47:55 +0000 (15:47 +0100)]
mon: MonCommands: accept FLAG(f) instead of 'f' in command sig

This allows us to do nifty stuff like 'FLAG(foo) | FLAG(bar)' and expand
it to (MonCommand::FLAG_foo | MonCommand::FLAG_bar), instead of being
bound by a single flag on macro expansion.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
10 years agoautomake: Fix out-of-tree build. 5238/head
Krzysztof Kosiński [Wed, 15 Jul 2015 12:44:42 +0000 (14:44 +0200)]
automake: Fix out-of-tree build.

Corrects minor Automake errors which prevented Ceph from building
when configure was invoked from a different directory than
the toplevel source directory.

Signed-off-by: Krzysztof Kosiński <krzysztof.kosinski@intel.com>
10 years agoMerge pull request #5143 from trociny/fix-mds_metadata
Kefu Chai [Thu, 16 Jul 2015 06:41:41 +0000 (14:41 +0800)]
Merge pull request #5143 from trociny/fix-mds_metadata

mon: fix mds metadata

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agopackaging: package libcls_cephfs.so 5256/head
Kefu Chai [Thu, 16 Jul 2015 06:21:03 +0000 (14:21 +0800)]
packaging: package libcls_cephfs.so

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agocls: fix the build on i386
Kefu Chai [Thu, 16 Jul 2015 06:04:07 +0000 (14:04 +0800)]
cls: fix the build on i386

time_t is more a arithmetic type. and it's not portable. it's always
defined as "long int" by libc. and we have no encode(int, bl), which
is expected. so a safe way is to use int64_t for presenting the mtime
returned from the stat() call.

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years ago mon/PGMonitor: use poolname reference instead of get it in osdmap 5255/head
huangjun [Thu, 16 Jul 2015 05:53:24 +0000 (13:53 +0800)]
  mon/PGMonitor: use poolname reference instead of get it in osdmap
Signed-off-by: huangjun <hjwsm1989@gmail.com>
10 years agoMerge pull request #4917 from hjwsm1989/wip-rest-bench
Kefu Chai [Thu, 16 Jul 2015 04:19:06 +0000 (12:19 +0800)]
Merge pull request #4917 from hjwsm1989/wip-rest-bench

 tools/rest_bench.cc: bucket is not mandatory bc we have a default one

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years ago rest_bench: bucketname is not mandatory as we have a default name 4917/head
huangjun [Thu, 16 Jul 2015 01:42:55 +0000 (09:42 +0800)]
  rest_bench: bucketname is not mandatory as we have a default name

Signed-off-by: huangjun <hjwsm1989@gmail.com>
10 years ago rest_bench: drain the work queue to fix a crash
huangjun [Thu, 16 Jul 2015 01:17:59 +0000 (09:17 +0800)]
  rest_bench: drain the work queue to fix a crash
Fixes: #3896
Signed-off-by: huangjun <hjwsm1989@gmail.com>
10 years agoPG::find_best_info: ignore info.les for incomplete peer 5188/head
Samuel Just [Wed, 20 May 2015 19:08:15 +0000 (12:08 -0700)]
PG::find_best_info: ignore info.les for incomplete peer

See included update to doc/dev/osd_internals/last_epoch_started.rst

Fixes: 11687
Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #5249 from tchaikov/wip-11101
Kefu Chai [Wed, 15 Jul 2015 15:53:16 +0000 (23:53 +0800)]
Merge pull request #5249 from tchaikov/wip-11101

ceph.in: improve the error message

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agoMerge pull request #5110 from ceph/wip-11864-rgw-mime-types-pkg
branto1 [Wed, 15 Jul 2015 15:49:05 +0000 (17:49 +0200)]
Merge pull request #5110 from ceph/wip-11864-rgw-mime-types-pkg

11864: packaging: RGW depends on /etc/mime.types

Reviewed-by: Boris Ranto <branto@redhat.com>
10 years agopackaging: RGW depends on /etc/mime.types 5110/head
Ken Dreyer [Tue, 23 Jun 2015 19:41:53 +0000 (13:41 -0600)]
packaging: RGW depends on /etc/mime.types

If the mimecap RPM or mime-support DEB is not installed, then the
/etc/mime.types file is not present on the system. RGW attempts to read
this file during startup, and if the file is not present, RGW logs an
error:

  ext_mime_map_init(): failed to open file=/etc/mime.types ret=-2

Make the radosgw package depend on the mailcap/mime-support packages so
that /etc/mime.types is always available on RGW systems.

http://tracker.ceph.com/issues/11864 Fixes: #11864

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #4699 from joehandzik/master
Sage Weil [Wed, 15 Jul 2015 13:47:22 +0000 (09:47 -0400)]
Merge pull request #4699 from joehandzik/master

FileStore: Collect device partition information

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4876 from ceph/wip-11855
Sage Weil [Wed, 15 Jul 2015 13:45:33 +0000 (09:45 -0400)]
Merge pull request #4876 from ceph/wip-11855

crush: fix 'ceph osd crush reweight-subtree'

Reviewed-by: Li Wang <liwang@ubuntukylin.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph.in: print more detailed warning for 'ceph <type> tell' 5249/head
Kefu Chai [Wed, 15 Jul 2015 11:03:33 +0000 (19:03 +0800)]
ceph.in: print more detailed warning for 'ceph <type> tell'

put the full signature of "tell <target> <command> [options...]"
instead of "tell {0}.<id>", which could be misleading somehow.

Fixes: 11101
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoceph.in: print more detailed error message for 'tell' command
Kefu Chai [Wed, 15 Jul 2015 10:01:52 +0000 (18:01 +0800)]
ceph.in: print more detailed error message for 'tell' command

* we do not allow user specify a certain daemon when starting an
  interactive session. the existing error message could lead to
  some confusion. so put more details in it.

Fixes: #11101
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #5245 from yuyuyu101/wip-async-fix-18
Haomai Wang [Wed, 15 Jul 2015 08:12:45 +0000 (16:12 +0800)]
Merge pull request #5245 from yuyuyu101/wip-async-fix-18

AsyncConnection: Fix incorrect sign_message usages

10 years agoMerge pull request #5244 from zhouyuan/rgw_obj_stripe_size
Loic Dachary [Wed, 15 Jul 2015 05:53:35 +0000 (07:53 +0200)]
Merge pull request #5244 from zhouyuan/rgw_obj_stripe_size

rgw: doc: Fix radosgw stripe size config ref

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agoMerge pull request #5240 from dachary/wip-ceph-release-notes
Loic Dachary [Wed, 15 Jul 2015 05:52:38 +0000 (07:52 +0200)]
Merge pull request #5240 from dachary/wip-ceph-release-notes

tools: src/script/ceph-release-notes normalization

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agoMerge pull request #5165 from zhouyuan/librados_default_crush_ruleset
Kefu Chai [Wed, 15 Jul 2015 02:37:06 +0000 (10:37 +0800)]
Merge pull request #5165 from zhouyuan/librados_default_crush_ruleset

Make librados pool_create respect default_crush_ruleset

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agolibrados: Make librados pool_create respect default_crush_ruleset 5165/head
Yuan Zhou [Wed, 8 Jul 2015 02:35:49 +0000 (10:35 +0800)]
librados: Make librados pool_create respect default_crush_ruleset

Make pool_create in librados use the osd_pool_default_crush_replicated_ruleset

Fixes: #11640
Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
10 years ago9.0.2 v9.0.2
Jenkins [Tue, 14 Jul 2015 20:10:32 +0000 (13:10 -0700)]
9.0.2

10 years agoAsyncConnection: Make sign_message ahead of construct message bufferlist 5245/head
Haomai Wang [Tue, 14 Jul 2015 18:06:36 +0000 (02:06 +0800)]
AsyncConnection: Make sign_message ahead of construct message bufferlist

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoAsyncConnection: Fix non-fastdispatch message doesn't prepare case
Haomai Wang [Tue, 14 Jul 2015 17:44:14 +0000 (01:44 +0800)]
AsyncConnection: Fix non-fastdispatch message doesn't prepare case

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agorgw: doc: Fix radosgw stripe size config ref 5244/head
Yuan Zhou [Tue, 14 Jul 2015 15:53:20 +0000 (23:53 +0800)]
rgw: doc: Fix radosgw stripe size config ref

s/rgw object stripe size/rgw obj stripe size
https://github.com/ceph/ceph/blob/master/src/common/config_opts.h#L1024

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
10 years agotools: src/script/ceph-release-notes normalization 5240/head
Loic Dachary [Tue, 14 Jul 2015 13:59:38 +0000 (15:59 +0200)]
tools: src/script/ceph-release-notes normalization

Issue an error if for the title does not start with a known prefix.
Issue an error if no issue is associated to a pull request.

Group the pull requests fixing the same issue together.

Add link to the issue and the pull request.

Signed-off-by: Loic Dachary <loic@dachary.org>
10 years agoMerge pull request #5230 from majianpeng/check_ops_in_flight_cleanup
Gregory Farnum [Tue, 14 Jul 2015 14:10:34 +0000 (15:10 +0100)]
Merge pull request #5230 from majianpeng/check_ops_in_flight_cleanup

common: clean up code for OpTracker::check_ops_in_flight.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agocommon: clean up code for OpTracker::check_ops_in_flight. 5230/head
Jianpeng Ma [Tue, 14 Jul 2015 14:02:21 +0000 (22:02 +0800)]
common: clean up code for OpTracker::check_ops_in_flight.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoMerge pull request #5220 from vumrao/wip-vumrao-12318
Kefu Chai [Tue, 14 Jul 2015 12:19:21 +0000 (20:19 +0800)]
Merge pull request #5220 from vumrao/wip-vumrao-12318

doc: change tcp rcvbuf and tcp nodelay to ms tcp rcvbuf and ms tcp nodelay

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agodoc: change tcp rcvbuf and tcp nodelay to ms tcp rcvbuf 5220/head
Vikhyat Umrao [Tue, 14 Jul 2015 03:42:06 +0000 (09:12 +0530)]
doc: change tcp rcvbuf and tcp nodelay to ms tcp rcvbuf
     and ms tcp nodelay

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
10 years agoMerge pull request #4939 from ceph/wip-offline-backward
Gregory Farnum [Tue, 14 Jul 2015 10:42:48 +0000 (11:42 +0100)]
Merge pull request #4939 from ceph/wip-offline-backward

cephfs-data-scan (offline backward file recovery)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #5190 from guce/master
Yehuda Sadeh [Mon, 13 Jul 2015 22:51:35 +0000 (15:51 -0700)]
Merge pull request #5190 from guce/master

radosgw-admin: after subuser modify print only once user info

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #5183 from zhouyuan/rgw_max_put_size_configurable
Yehuda Sadeh [Mon, 13 Jul 2015 22:47:56 +0000 (15:47 -0700)]
Merge pull request #5183 from zhouyuan/rgw_max_put_size_configurable

rgw: Make RGW_MAX_PUT_SIZE configurable

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #5213 from wido/wip-rgw-keepalive
Yehuda Sadeh [Mon, 13 Jul 2015 22:30:24 +0000 (15:30 -0700)]
Merge pull request #5213 from wido/wip-rgw-keepalive

rgw: If the client sends a Connection: close header respond accordingly.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #5210 from tweenk/docs-improvements
Josh Durgin [Mon, 13 Jul 2015 20:41:34 +0000 (13:41 -0700)]
Merge pull request #5210 from tweenk/docs-improvements

Document librbd::parent_spec and librbd::parent_info.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #5215 from SUSE/wip-fdupes
Ken Dreyer [Mon, 13 Jul 2015 16:26:26 +0000 (10:26 -0600)]
Merge pull request #5215 from SUSE/wip-fdupes

ceph.spec.in: do not run fdupes, even on SLE/openSUSE

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoceph.spec.in: do not run fdupes, even on SLE/openSUSE 5215/head
Nathan Cutler [Mon, 13 Jul 2015 16:12:01 +0000 (18:12 +0200)]
ceph.spec.in: do not run fdupes, even on SLE/openSUSE

In openSUSE there is a policy to use %fdupes in the spec file if RPMLINT
complains about duplicate files wasting space in the filesystem.

However, RPMLINT is not so complaining, so drop fdupes.

http://tracker.ceph.com/issues/12301 Fixes: #12301

Signed-off-by: Nathan Cutler <ncutler@suse.com>
10 years agoMerge pull request #5102 from ceph/wip-mds-refactor-small
Gregory Farnum [Mon, 13 Jul 2015 15:01:40 +0000 (16:01 +0100)]
Merge pull request #5102 from ceph/wip-mds-refactor-small

Minor MDS:: refactor

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #5209 from zhouyuan/rgw_swift_user
Sage Weil [Mon, 13 Jul 2015 14:15:07 +0000 (10:15 -0400)]
Merge pull request #5209 from zhouyuan/rgw_swift_user

rgw: Make vstart.sh print out swift user info

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agopackaging: add cephfs-data-scan 4939/head
John Spray [Thu, 14 May 2015 15:05:48 +0000 (16:05 +0100)]
packaging: add cephfs-data-scan

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agotools/cephfs: add cephfs-data-scan
John Spray [Wed, 29 Apr 2015 12:45:46 +0000 (13:45 +0100)]
tools/cephfs: add cephfs-data-scan

For scraping cephfs data pools for metadata in
backtraces, and injecting that metadata into
the cephfs metadata pool (initially offline).

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agodoc: add some docs about cephfs-data-scan
John Spray [Fri, 8 May 2015 15:22:20 +0000 (16:22 +0100)]
doc: add some docs about cephfs-data-scan

These are deliberately fairly sparse, because:
 * These tools are for experts
 * These tools may well be wrapped in a higher
   level recovery tool that orchestrates parallel
   workers at some stage.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoinclude/ceph_fs.h: define magic LOST+FOUND ino
John Spray [Fri, 8 May 2015 13:24:37 +0000 (14:24 +0100)]
include/ceph_fs.h: define magic LOST+FOUND ino

So that recovery tools can create this dir without
having to consult/modify InoTable.

Signed-off-by: John Spray <john.spray@redhat.com>