cls/rbd/cls_rbd.cc: reduce scope of variable rc

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

rgw/rgw_op.cc: use empty() instead of size()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

ceph-filestore-dump.cc: use empty() instead of size()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

Merge branch 'wip_pg_res'

Reviewed-by: Sage Weil <sage@inktank.com>

OSD: rename clear_temp to recursive_remove_collection()

Signed-off-by: Samuel Just <sam.just@inktank.com>

osd: remove_dir use collection_list_partial

Signed-off-by: Samuel Just <sam.just@inktank.com>

PG: no need to wait on DeletingStateRef for flush

Signed-off-by: Samuel Just <sam.just@inktank.com>

osd_internals/pg_removal.rst: update for pg resurrection

Signed-off-by: Samuel Just <sam.just@inktank.com>

OSD: add pg deletion cancelation

DeletingState now allows _create_lock_pg() to attempt to cancel
pg deletion.

PG::init() must mark the PG as backfill iff we stopped a deletion.

Signed-off-by: Samuel Just <sam.just@inktank.com>

common/sharedptr_registry.hpp: add remove

remove() can be used to clear an entry before all of its
references are removed.

Signed-off-by: Samuel Just <sam.just@inktank.com>

Merge branch 'master' of https://github.com/ceph/ceph

doc: Updated doc for connectivity. Updated text with glossary terms.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

doc: Updated disk syntax. Updated text with glossary terms.

fixes: #4933

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

Merge pull request #267 from ceph/wip-coverity

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

doc: Added connectivity section. Updated doc with glossary terms.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

doc: Added the non-implemented bit for the gateway to the dev/radosgw TOC.

fixes: #4978

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

OSD: don't rename pg collections, handle PGs in RemoveWQ

Signed-off-by: Samuel Just <sam.just@inktank.com>

Merge branch 'master' of https://github.com/ceph/ceph

doc: Republishing the admin operations API for the gateway.

fixes: #4978

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

doc: Republishing the admin operations API for the gateway.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

doc: Document admin api web interface.

Signed-off-by: caleb miles <caleb.miles@inktank.com>

osd: initialize OSDService::next_notif_id

CID 1019627 (#1 of 1): Uninitialized scalar field (UNINIT_CTOR)
2. uninit_member: Non-static class member "next_notif_id" is not initialized in this constructor nor in any functions that it calls.

Signed-off-by: Sage Weil <sage@inktank.com>

osd: init test_ops_hook

CID 1019628 (#1 of 1): Uninitialized pointer field (UNINIT_CTOR)
2. uninit_member: Non-static class member "test_ops_hook" is not initialized in this constructor nor in any functions that it calls.

Signed-off-by: Sage Weil <sage@inktank.com>

rbd: fix buffer leak in do_import

CID 1019580 (#2 of 2): Resource leak (RESOURCE_LEAK)
10. leaked_storage: Variable "p" going out of scope leaks the storage it points to.

Signed-off-by: Sage Weil <sage@inktank.com>

librbd: fix possible use-after-free

(of the pointer)

CID 966634 (#1 of 1): Use after free (USE_AFTER_FREE)
2. use_after_free: Using freed pointer "ictx".

Signed-off-by: Sage Weil <sage@inktank.com>

ceph-filestore-dump: fix uninit fields in ctor

Signed-off-by: Sage Weil <sage@inktank.com>

rgw: fix various uninit class fields

Signed-off-by: Sage Weil <sage@inktank.com>

radosgw-admin: fix fd leak in read_input()

Signed-off-by: Sage Weil <sage@inktank.com>

rados: fix fd leak

Signed-off-by: Sage Weil <sage@inktank.com>

rados: fix buffer leak

Signed-off-by: Sage Weil <sage@inktank.com>

os/Filestore: fix fd leak in error path

Signed-off-by: Sage Weil <sage@inktank.com>

mon: fix Formatter leak

Signed-off-by: Sage Weil <sage@inktank.com>

mds: fix fd leak

Signed-off-by: Sage Weil <sage@inktank.com>

doc/release-notes: v0.61.1 release notes

Signed-off-by: Sage Weil <sage@inktank.com>

Merge remote-tracking branch 'gh/next'

Conflicts:
src/mon/MonitorDBStore.h

mon: dump MonitorDBStore transactions to file

Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit 797089ef082b99910eebfd9454c03d1f027c93bb)

osd: optionally enable leveldb logging

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 0b4c5c1a3349670d11cc3c4fb3c4b3c1a80b2502)

mon: allow leveldb logging

'mon leveldb log = filename'

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit c1d5f815546b731e10bfcb81cbcd48b7d432e9c4)

common/Preforker: fix warnings

Signed-off-by: Sage Weil <sage@inktank.com>

debian/control:  squeeze requres cryptsetup package

Squeeze requires the cryptsetup package which has been renamed
cryptsetup-bin in later versions.  Allow either package to
satisfy the dependency.

Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
(cherry picked from commit 83bbae415de16f708ca1cb24861ddbb0bd514a7f)

debian/control:  squeeze requres cryptsetup package

Squeeze requires the cryptsetup package which has been renamed
cryptsetup-bin in later versions.  Allow either package to
satisfy the dependency.

Signed-off-by: Gary Lowell <gary.lowell@inktank.com>

ceph-create-keys: gracefully handle no data from admin socket

Old ceph-mon (prior to 393c9372f82ef37fc6497dd46fc453507a463d42) would
return an empty string and success if the command was not registered yet.
Gracefully handle that case by retrying.

If we still fail to parse, exit entirely with EINVAL.

Fixes: #4952
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@intank.com>

init-ceph: fix osd_data location when checking df utilization

Do not assume default osd data location.

Fixes: #4951
Backport: cuttlefish, bobtail
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Gary Lowelll <gary.lowell@inktank.com>

Merge pull request #266 from ceph/wip-4949

osd: don't assert if get_omap_iterator() returns NULL

Reviewed-by: Sam Just <sam.just@inktank.com>

osd: don't assert if get_omap_iterator() returns NULL

Fixes: #4949
This can happen if the object does not exist and it's
a write operation. Just return -ENOENT.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

Merge pull request #165 from dachary/wip-4321

unit tests for FileStore::_detect_fs when running on ext4

rgw: user operation mask

Fixes: #4716
add user operation mask for controlling user permissions.
Also add admin controls for it.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>

Merge pull request #180 from ceph/wip-rados-clone

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Merge branch 'wip_split_upgrade' into next

Fixes: #4927

OSD: handle stray snap collections from upgrade bug

Previously, we failed to clear snap_collections, which causes split to
spawn a bunch of snap collections.  In load_pgs, we now clear any such
snap collections and then snap_collections field on the PG itself.

Related: #4927
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

PG: clear snap_collections on upgrade

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

OSD: snap collections can be ignored on split

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

Merge pull request #265 from ceph/wip-mon-trace

mon: set MonitorDBStore options on open

So both ctors set the options.

Signed-off-by: Sage Weil <sage@inktank.com>

Merge pull request #254 from ceph/wip-crush-rules

Reviewed-by: Joao Luis <joao.luis@inktank.com>

ceph: return error code when failing to get result from admin socket

Make sure we return a non-zero result code when we fail to read something
from the admin socket.

Backport: cuttlefish, bobtail
Signed-off-by: Sage Weil <sage@inktank.com>

ceph-monstore-tool: added replay

ceph-monstore-tool: add MonitorDBStore trace dumper

Signed-off-by: Samuel Just <sam.just@inktank.com>

mon: dump MonitorDBStore transactions to file

Signed-off-by: Samuel Just <sam.just@inktank.com>

Merge pull request #261 from ceph/wip-leveldb

Reviewed-by: Samuel Just <sam.just@inktank.com>

doc/install/os-recs: reverse order of releases

Signed-off-by: Sage Weil <sage@inktank.com>

Merge pull request #263 from wido/config-get

Add "config get <var>" to the admin

Reviewed-by: Sage Weil <sage@inktank.com>

doc: Fixed typos.

fixes: #4932

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

doc: Fixed typo.

fixes: #4422

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

doc: Removed "and" as suggested.

fixes: #3686

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

doc: Fixed hyperlink.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

doc: Fixed path typo.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

doc: Updated OS support for Cuttlefish.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

doc: Minor tweak to the definition list style.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

WorkQueue: Allow WorkQueueVal to be specified with 1 type

Signed-off-by: Samuel Just <sam.just@inktank.com>

OSD: removal collections will be removed inline and not queued

Signed-off-by: Samuel Just <sam.just@inktank.com>

OSD::clear_temp should clear snap mapper entries as well

Signed-off-by: Samuel Just <sam.just@inktank.com>

PG,OSD: mark info as backfilling in _remove_pg()

Signed-off-by: Samuel Just <sam.just@inktank.com>

doc: Added glossary to TOC.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

doc: Added glossary.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

doc: Fixed usage typo.

fixes: #4923

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

Merge pull request #262 from gollub/typos

fixed common typo in error messages

Fix whitespace indentation

Signed-off-by: Wido den Hollander <wido@42on.com>

Implement 'config get <var>' for the admin socket

Signed-off-by: Wido den Hollander <wido@42on.com>

fixed common typo in error messages

Signed-off-by: Daniel Gollub <d.gollub@telekom.de>

doc/install/{debian,rpm}: update for cuttlefish

Signed-off-by: Sage Weil <sage@inktank.com>

doc/start/get-involved: fix links

ERROR: /srv/autobuild-ceph/gitbuilder.git/build/doc/start/get-involved.rst:33: Unknown target name: "tracker".
ERROR: /srv/autobuild-ceph/gitbuilder.git/build/doc/start/get-involved.rst:43: Unknown target name: "support".

Signed-off-by: Sage Weil <sage@inktank.com>

doc/release-notes: I missed rgw rest api in the release notes

Mostly from here dd19d693e6528c70167958ebc57e075200a08803

Signed-off-by: Sage Weil <sage@inktank.com>

Merge branch 'next'

os/ObjectStore: add missing break in dump()

CID 751331 (#1 of 1): Missing break in switch (MISSING_BREAK)
unterminated_case: This case (value 35) is not terminated by a 'break' statement.

Signed-off-by: Sage Weil <sage@inktank.com>

rados: add whole-object 'clonedata' command

Clone the data stream from one object to another.

Signed-off-by: Sage Weil <sage@inktank.com>

doc: Deleted redundant "so that" phrase.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

doc: Corrected typo.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

doc: Corrected typo.

Removed comment out of header, and added "coming soon."

doc: Updated usage for push | pull.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

osd: make class load errors louder

Fixes: #4639
Signed-off-by: Sage Weil <sage@inktank.com>

osd: optionally enable leveldb logging

Signed-off-by: Sage Weil <sage@inktank.com>

mon: allow leveldb logging

'mon leveldb log = filename'

Signed-off-by: Sage Weil <sage@inktank.com>

v0.61

os/: default to dio for non-block journals

Workaround: #4910
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

ceph-disk: use separate lock files for prepare, activate

Use a separate lock file for prepare and activate to avoid deadlock.  This
didn't seem to trigger on all machines, but in many cases, the prepare
process would take the file lock and later trigger a udev event and the
activate would then block on the same lock, either when we explicitly call
'udevadm settle --timeout=10' or when partprobe does it on our behalf
(without a timeout!).   Avoid this by using separate locks for prepare
and activate.  We only care if multiple activates race; it is
okay for a prepare to be in progress and for an activate to be kicked
off.

Signed-off-by: Sage Weil <sage@inktank.com>

ceph-test.install: add ceph-monstore-tool and ceph-osdomap-tool

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

ceph.spec.in: remove twice listed ceph-coverage

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

ceph.spec: add some files to ceph

Add installed, but not packaged files to ceph-test (ceph-monstore-tool,
ceph-osdomap-tool) rpm file section.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>