client/SyntheticClient.cc: check return value of describe_layout()

Fix SyntheticClient::chunk_file(): check return value of
describe_layout() and handle the error.

CID 966615 Unchecked return value (CWE-252)

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

client/Client.cc: fix possible NULL pointer dereference

CID 751332 Dereference null return value (CWE-476)

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

rados.cc: fix leaking of Formatter*

Make sure Formatter* is deleted in error case.

717096 Resource leak (CWE-404) (25 of 25 cases)

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

client/SyntheticClient.cc: fix another memory leak

Fix memory leak in read_random: call delete[] on buf before
call new[] again in the for-loop.

CID 717071 Resource leak (CWE-404)

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

client/SyntheticClient.cc: fix memory leak

Fix memory leak in read_random: call delete[] on buf before
call new[] again in the for-loop.

CID 717070 Resource leak (CWE-404)

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

mds/MDCache.cc: fix dereference NULL pointer

Fix possible NULL pointer dereference. Change return value of
CInode::get_dirfrag() to return NULL instead of 0 since it's a
pointer returned.

CID 716991 Dereference null return value (CWE-478)

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

mds/MDCache.cc: add NULL pointer check

Check for result of get_inode() for NULL before use the pointer.

716990 Dereference null return value (CWE-476)

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

mds/Server.cc: remove dead default in switch

The default switch can't get executed since the switch value
can only have the two values already checked.

CID 716894 Dead default in switch (CWE-561)

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

osd/OSD.h: add missing unlock of osd_lock

CID 1019560 Missing unlock (CWE-667)

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

rgw/rgw_rest.cc: remove dead and unneeded code

Since origin and meth are already checked to be true there is
no need to check again in s->cio->print() after the initial check.

1019551 Logically dead code (CWE-561)
1019552 Logically dead code (CWE-561)

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

rbd.cc: fix error handling

Fix undead code. Get error code from write_fd() before check
the result against < 0.

CID 1019550 Logically dead code (CWE-561)

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

rados_sync.cc: remove dead and not needed code

The first if handles all chars < 32, the last 2 if's check for
'\n' (10) and '\r' (13). This code will never be reached and
is already covered. Remove unneeded code.

CID 1019549 Logically dead code (CWE-561)

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

test/omap_bench.cc: remove dead code

CID 716900 Logically dead code (CWE-561)
CID 716901 Logically dead code (CWE-561)
CID 727968 Logically dead code (CWE-561)

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

libcephfs/test.cc: add assert for result of ceph_getxattr()

Check result of ceph_getxattr() before pass it as parameter to
strncmp(). Make sure it's not negative.

CID 739411 Argument cannot be negative (CWE-687)

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

rgw/rgw_user.cc: add missing break in switch

Fix switch handling for case KEY_TYPE_SWIFT, add break after the
case to prevent fall through into KEY_TYPE_S3 case.

CID 1019563 Missing break in switch (CWE-484)

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

client/SyntheticClient.cc: add missing break in switch

Fix switch handling for case SYNCLIENT_MODE_OVERLOAD_OSD_0, add break
after the case to prevent fall through into next case.

CID 716958 Missing break in switch (CWE-484)

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

ObjectStore.cc: add missing break in switch

Fix switch handling for case OP_SPLIT_COLLECTION2, add break after
the case to prevent fall through into default case.

CID 1019562 Missing break in switch (CWE-484)

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

doc: Fixed typos. Somehow got a merge error.

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

mds: be more explicit about path_traverse completion

Coverity turned up

CID 717085 (#1 of 1): Resource leak (RESOURCE_LEAK)
10. leaked_storage: Variable "c" going out of scope leaks the storage it points to.

from _find_ino_dir(), but for all r > 0 cases fin is consumed.  Make this
a bit more explicit by using the helper in the mdr-only case, and by
asserting it is zero in the return 2 path.  Hopefully coverity will notice.

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

doc: fix broken link to ceph-deploy in release notes

Signed-off-by: Ross Turk <ross@inktank.com>

doc: Added entry for the RGW Admin Ops API.

fixes: #5002

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

Merge pull request #271 from dalgaaf/wip-da-sca-cppcheck-v2.1

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

libcephfs_jni.cc: reduce scope of ret variable

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

include/ceph_hash.cc: reduce scope of a var in ceph_str_hash_rjenkins()

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

include/addr_parsing.c: reduce scope of port_str in safe_cat()

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

global/global_init.cc: reduce scope of ret in global_init_daemonize()

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

crush/builder.c: reduce scope of oldsize in crush_add_bucket()

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

common/safe_io.c: reduce scope of some ssize_t variables

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

common/obj_bencher.cc: reduce scope of avg_bandwidth

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

common/ceph_argparse.cc: remove scope of some variables

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

common/admin_socket.cc: remove scope of ret variable in do_accept()

Reduce scope of ret variable and remove usage in one case.

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

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>

doc: Updated usage syntax. Added links to hardware and manual OSD remove.

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

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>