Merge pull request #7480 from trociny/fix-journal-commit_position_task

journal: reset commit_position_task_ctx pointer after task complete

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

script/run-coverity: fix user

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

journal: reset commit_position_task_ctx pointer after task complete

Otherwise, schedule_commit_task() would never schedule the next task
and the commit position would not be committed until shutdown.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>

Merge remote-tracking branch 'gh/wip-da-SCA-20150910'

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #7473 from yehudasa/wip-14516

rgw-admin: document orphans commands in usage

Merge pull request #7451 from wjin/fix

msg/async: fix array boundary

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #6813 from manens/pybind_rados_snapshot_read

pybind: Implementation of Ioctx.set_read to allow read from snapshots

Reviewed-by: Kefu Chai <kchai@redhat.com>

rgw-admin: document orphans commands in usage

Fixes: #14516
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #7445 from xiexingguo/xxg-wip-mem

osd: memstore: fix blocksize for statfs

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

os/bluestore: fix typo (again)

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

os/bluestore: fix typo

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

Merge pull request #7400 from yuyuyu101/wip-13938

librbd: Avoid create two threads per image

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #7409 from dillaman/wip-librbd-watch-notify

tests: improve simulation of watch/notify handling

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #6562 from Aran85/authedpermcheck

rgw: fix the condition of  authenticated user's permit check .

Merge pull request #7291 from majianpeng/vstart.sh

vstart.sh: If use '-n' delete related source rather than consider '-k'.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #7397 from tchaikov/wip-kill-warnings

build: kill warnings

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

civetweb: update submodule to silence a compile warning

Signed-off-by: Kefu Chai <kchai@redhat.com>

common,osd: remove _process(T *t) to silence warnings

* and mark the WorkQueue::_process(T *, TPHandle&) a pure virtual
  method. so we must override it
* and mark all override methods with the "override" specifier.

Signed-off-by: Kefu Chai <kchai@redhat.com>

rgw: fix the condition of authenticated user's permit check

before fix:
put a bucket under one user with authenticated-read permit
> ./s3curl.pl http://myobs.com/mybucket --put --H "x-amz-acl: authenticated-read"
GET the bucket with anonymous user
> curl http://myobs.com/mybucket -X GET

> successed!

after fix:
anonymous cant GET the authenticated-read bucket
other users who authenticated could GET it

Signed-off-by: Zengran Zhang <zhangzengran@h3c.com>

Merge pull request #7266 from sahithi-rv/master

common/str_map: cleanup: replaced get_str_map() function overloading by using default parameters for delimiters

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

Merge pull request #7344 from songbaisen/song8

crush: add safety assert

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

Merge pull request #7363 from cxwshawn/mon-sync-fix

mon: add mon_config_key prefix when sync full

Fixes: #14577
Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #7383 from liewegas/wip-bluestore

osd: bluestore: some new c++11-isms, a couple reverts

Event: fix array boundary

fd should be less than nevent when deleting

Signed-off-by: Wei Jin <wjin.cn@gmail.com>

cmake: fix "jobserver unavailable" warning

use ${MAKE} so the make command can be properly propagated to their
children

Signed-off-by: Kefu Chai <kchai@redhat.com>

cmake: disable unused-variable warning for rocksdb

Signed-off-by: Kefu Chai <kchai@redhat.com>

rgw: fix the signed/unsigned comparison warning

Signed-off-by: Kefu Chai <kchai@redhat.com>

rados: bench: fix the signed/unsigned comparison warning

Signed-off-by: Kefu Chai <kchai@redhat.com>

cmake: remove duplicated HAVE_EXECINFO_H macro

fixes the `"HAVE_EXECINFO_H" redefined` warning

Signed-off-by: Kefu Chai <kchai@redhat.com>

os/*stores: fix hidden warnings

the CollectionHandle variant methods are hidden by the subclasses
who do not override it. so the compiler complains. by adding
"using" statement we expose them again.

Signed-off-by: Kefu Chai <kchai@redhat.com>

os/bluestore: fix unsigned/signed comparision warning

Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #7014 from efirs/ef_replace_coll_t_by_const_coll_t_ref

osd: reduce CPU usage by replacing coll_t by const coll_t&

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #7333 from xdonghai/xdh1

osd: FileStore: modify the format of colon

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

Merge pull request #7392 from tianshan/wip-14536

rados: fix race condition in load-gen complete callback

Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>

Merge pull request #7395 from xiexingguo/xxg-wip-fuse

os/fusestore: add error handling

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

Merge pull request #7396 from tchaikov/wip-14537

mon: compact full epochs also

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

Merge pull request #7402 from liewegas/wip-rados-bench

rados: make rados bench metadata backward compatible

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #7418 from renhwsky/renhw-wip-monmapmonitor-cleanup

mon: some cleanup in MonmapMonitor.cc

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>

Merge pull request #7420 from mikulely/fix-osd-mon-exit-issue

osd, mon: fix exit issue

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #7430 from xiexingguo/xxg-wip-kstore

osd: kstore: fix decode logic and add flush

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

Merge pull request #7432 from branch-predictor/bp-fix-read-bench

rados: fix wrong op/object sizes in rand/seq bench

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

Merge pull request #7436 from liewegas/wip-bash

tests: qa/workunits/objectstore/test_fuse.sh: no bashism

os/memstore: return empty list if offset overflows

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

os/memstore: fix wrong blocksize for statfs

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #7404 from sahithi-rv/Mutex

rbd_fuse: replaced pthread_mutex*() functions with ceph Mutex wrapper

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

add some cppcheck-suppress noExplicitConstructor comments

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

make ctors with one argument explicit

Use explicit keyword for constructors with one argument to
prevent implicit usage as conversion functions.

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

rgw/rgw_rest.cc: fix -Wsign-compare

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

test/librados/list.cc: fix -Wsign-compare

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

tools/rbd/action/Nbd.cc: prefer ++operator for non-primitive iterators

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

tools/rbd/action/Journal.cc: prefer ++operator for non-primitive iterators

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

osd/osd_types.cc: prefer ++operator for non-primitive iterators

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

os/bluestore/BlueStore.cc: prefer ++operator for non-primitive iterators

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

librbd/internal.cc: prefer ++operator for non-primitive iterators

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

librbd/LibrbdAdminSocketHook.cc: prefer ++operator for non-primitive iterators

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

journal/JournalMetadata.cc: prefer ++operator for non-primitive iterators

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

test/osd/RadosModel.h: fix class member hiding member from base

The 'done' member of derived class is hiding 'done' member from
TestOp base class. Remove 'done' from derived classes.

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

rgw/rgw_rados.h: init member in ctor list

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

rgw/rgw_orphan.h: init member in ctor init list instead of body

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

rgw/rgw_common.h: init members in ctor init list instead of body

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

common/RWLock.h: init member in ctor init list

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

src/ceph_fuse.cc: init members in ctor

There is no need to call parent class ctor directly in
ctor init list. Instead init some missing members.

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

test/librbd/fsx.cc: clarify calculation precedence for '&' and '?'

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

MergeDiff.cc: close 'sd' correctly at the end of do_merge_diff()

Fix for:

CID 1265562 (#1 of 1): Resource leak (RESOURCE_LEAK)
 leaked_handle: Handle variable sd going out of scope leaks the handle.

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

test/encoding/ceph_dencoder.cc: fix null pointer deref

Fix for:

test/encoding/ceph_dencoder.cc:452:11: warning: Called C++ object pointer is null
      if (den->is_deterministic())
          ^~~~~~~~~~~~~~~~~~~~~~~

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

src/mds/MDSRank.cc: remove delete calls from handle_asok_command()

The allocated 'Formatter' passed to the function should be
freed by the caller to avoid missusage.

If handle_asok_command() free's the pointer to 'Formatter' to pass
an indication of an error back to the caller, it should have at least
set the pointer to NULL to work anyway.

Fix for:

CID 1316253 (#1 of 1): Use after free (USE_AFTER_FREE)
 deref_arg: Calling flush dereferences freed pointer f. (The dereference
 happens because this is a virtual function call.)

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

rgw/rgw_rados.cc: close resource leak in error case

Fix for:

CID 1297867 (#1 of 1): Resource leak (RESOURCE_LEAK)
 alloc_arg: put_obj_init allocates memory that is stored into
  out_stream_req.
 leaked_storage: Variable out_stream_req going out of scope leaks
  the storage it points to.

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

auth/Crypto.cc: close theoretical memory leak

Fix for:

CID 1296382 (#1 of 1): Resource leak (RESOURCE_LEAK)
 leaked_storage: Variable ckh going out of scope leaks the storage
 it points to.

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

os/bluestore/BlueStore.cc: fix UNINIT_CTOR in BlueStore

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

mon/OSDMonitor.h: fix UNINIT_CTOR

Remove unused variable 'CephContext *cct'.

Fix for:

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

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

bluestore/bluestore_types.h: fix UNINIT_CTOR warning

Fix for:

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

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

msg/simple/Pipe.cc: silence cppcheck warning about reassign before use

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

mon/PGMonitor.cc: return error instead of '0' from dump_stuck_pg_stats()

Fix for:

[src/mon/PGMonitor.cc:1667] -> [src/mon/PGMonitor.cc:1669]: (performance)
 Variable 'r' is reassigned a value before the old one has been used.

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

mon/PGMonitor.cc: assign result directly

Fix for:

[src/mon/PGMonitor.cc:1514] -> [src/mon/PGMonitor.cc:1515]: (performance)
 Variable 'pool' is reassigned a value before the old one has been used.

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

test_crc32c.cc: close memory leak, free 'b' after malloc

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

global_init.cc: add tag for cppcheck to suppress intentional memleak

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

tools/cephfs/DataScan.cc: fix expression

Fix for:

[src/tools/cephfs/DataScan.cc:1137] -> [src/tools/cephfs/DataScan.cc:1137]:
 (style) Same expression on both sides of '|'.

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

osd/OSD.cc: fix UNINTENDED_INTEGER_DIVISION

Fix for:

CID 1297883 (#1 of 1): Result is not floating-point (UNINTENDED_INTEGER_DIVISION)
 integer_division: Dividing integer expressions this->cct->_conf->osd_heartbeat_grace
 and 2, and then converting the integer quotient to type double. Any remainder,
 or fractional part of the quotient, is ignored.

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

tools/rados/rados.cc: fix UNINTENDED_INTEGER_DIVISION

Fix for:

CID 1297882 (#1 of 1): Result is not floating-point (UNINTENDED_INTEGER_DIVISION)
 integer_division: Dividing integer expressions ns and 1000000000UL, and then
 converting the integer quotient to type float. Any remainder, or fractional
 part of the quotient, is ignored.

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

ECBackend.cc: fix dynamic_cast error handling

Fix for:

CID 1316232 (#1 of 1): Unchecked dynamic_cast (FORWARD_NULL)
 dynamic_cast: Dynamic cast to pointer dynamic_cast <ReplicatedPG *>(this->get_parent())
  can return NULL.
 var_deref_model: Passing null pointer dynamic_cast <ReplicatedPG *>(this->get_parent())
  to is_undersized, which dereferences it.

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

man/8/ceph.rst: fix man page --admin-daemon

The option "--admin-socket ADMIN_SOCKET/DAEMON_NAME" was blocked
as fix for #3944, fix man page to reflect it.

Fix for make warning:

doc/man/8/ceph.rst:5: SEVERE: Duplicate ID: "cmdoption-ceph--admin-socket".

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

crush/CrushTester.cc: remove unused variable

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

rbd-replay-prep.cc: replace inefficient string::find() w/ compare()

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

crush/CrushTester.cc: remove unused variable

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

mon/Monitor.cc: replace inefficient usage of string::find() with compare()

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

mds/Server.cc: use string::compare() instead of ::find()

Replace inefficient use of string::find() in conditions with
string::compare().

Changed checks in handle_set_vxattr() to call find/compare
on the 'name' only once.

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

ceph_mon.cc: replace string::find() with compare()

Fix for:

[src/ceph_mon.cc:396]: (performance) Inefficient usage of string::find()
 in condition; string::compare() would be faster.

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

tools/rados/rados.cc: fix race condition in load-gen complete callback

Fixes: #14536
Signed-off-by: Tianshan Qu <tianshan@xsky.com>

Merge pull request #6131 from rzarzynski/wip-admincreds-in-s3-keystone

rgw: support admin credentials in S3-related Keystone authentication.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

rgw: support admin credentials in S3-related Keystone authentication.

Fixes: #13302
Backport: infernalis, hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

Merge pull request #7298 from racpatel/wip-doc-rac2

doc :- fixing image in section ERASURE CODING

Reviewed-by: Loic Dachary <ldachary@redhat.com>

ceph_osd.cc: fix unreachable flush call

The calling chain for generic_server_usage():

  generic_server_usage()
    ->generic_usage(true)
    ->exit(1)
  cout.flush()

any statements after generic_server_usage() would not be reached,so we
need to flush cout in generic_usage().

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>

cmake: musl libc does not implement backtrace. Added feature check and fallback to libexecinfo.

Signed-off-by: John Coyle <dx9err@gmail.com>

Merge pull request #7264 from ceph/wip-doc-RGW

doc: rgw: port changes from downstream to upstream

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #7244 from mikulely/fix-authtool-doc

doc: remove redundant space in ceph-authtool/monmaptool doc

doc: Updated the RPM section for RHEL and CentOS

Fixes: #10245
Signed-off-by: Aron Gunn <ritz_303@yahoo.com>

Merge pull request #7027 from mathslinux/fix-s3-csharp-doc

doc: fix S3 C# example

Merge pull request #7000 from zhouyuan/fix_cache_tier_doc

doc: fix misleading configuration guide on cache tiering

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

Merge pull request #6930 from wido/rgw-key-docs

doc: use 'ceph auth get-or-create' for creating RGW keyring

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

Merge pull request #7384 from wido/mirroring

doc: script and guidelines for mirroring Ceph

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>