tools: skip up to expire_pos in journal-tool

Previously worked for journals starting from an
object boundary (i.e. freshly created filesystems)

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

ceph.in: remove '--' from injectargs, if there, as well

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

msg/Pipe: discard delay queue before incoming queue

Shutdown the delayed delivery before the incoming queue in case the
DelayedDelivery thread is busy queuing messages.

Fixes: #9910
Signed-off-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <greg@inktank.com>

Merge tag 'v0.87'

v0.87

Merge pull request #2829 from ceph/wip-doc-fs-quickstart

doc: include 'fs new' stuff in cephfs quickstart

Merge pull request #2828 from Vicente-Cheng/master

rbd: Fix the rbd export when image size more than 2G

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

0.87

doc: include 'fs new' stuff in cephfs quickstart

Not sure how 'quick' this really is now compared with
the full filesystem instructions, but let's not leave
it incomplete.

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

rbd: Fix the rbd export when image size more than 2G

When using export <image-name> <path> and the size of image is more
than 2G, the previous version about finish() could not handle in
seeking the offset in image and return error.

This is caused by the incorrect variable type. Try to use the correct
variable type to fixed it.

I use another variable which type is uint64_t for confirming seeking
and still use the previous r for return error.

uint64_t is more better than type int for handle lseek64().

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>

Merge pull request #2823 from dachary/wip-9919-injectargs-side-effects

qa: avoid qa/workunits/cephtool/test.sh unstability

Backport: giant, firefly
Reviewed-by: Sage Weil <sage@redhat.com>

qa: avoid qa/workunits/cephtool/test.sh unstability

For testing injectargs a configuration option was changed that has side
effects on the cluster. It could introduce random failures later. It is
replaced with a configuration option that cannot have adverse side
effects on the cluster.

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

Signed-off-by: Loic Dachary <loic-201408@dachary.org>

Merge remote-tracking branch 'origin/giant'

Merge remote-tracking branch 'origin/wip-9806-giant' into giant

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

Merge pull request #2809 from ceph/wip-9800

client: allow xattr caps in inject_release_failure

Reviewed-by: Greg Farnum <greg@inktank.com>

client: allow xattr caps in inject_release_failure

Because some test environments generate spurious
rmxattr operations, allow the client to release
'X' caps.  Allows xattr operations to proceed
while still preventing client releasing other caps.

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

Merge pull request #2818 from hjwsm1989/master

  Fix the match error when starting OSD daemons.

Reviewed-by: Loic Dachary <loic-201408@dachary.org>

  Fix the match error when starting OSD daemons.
  If we have osd.7 and osd.77 on the same host, osd.7 will not be mounted if
  osd.77 is mounted.
Signed-off-by: huangjun <hjwsm1989@gmail.com>

Merge pull request #2815 from wonzhq/evict-atime

osd: cache tiering: fix the atime logic of the eviction

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

osd: cache tiering: fix the atime logic of the eviction

Reported-by: Xinze Chi <xmdxcxz@gmail.com>
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>

Merge pull request #2786 from ceph/wip-9869

client: cast m->get_client_tid() to compare to 16-bit Inode::flushing_cap_tid

client: cast m->get_client_tid() to compare to 16-bit Inode::flushing_cap_tid

m->get_client_tid() is 64 bits (as it should be), but Inode::flushing_cap_tid
is only 16 bits. 16 bits should be plenty to let the cap flush updates
pipeline appropriately, but we need to cast in the proper direction when
comparing these differently-sized versions. So downcast the 64-bit one
to 16 bits.

Fixes: #9869
Backport: giant, firefly, dumpling

Signed-off-by: Greg Farnum <greg@inktank.com>

Merge pull request #2802 from dachary/wip-mailmap

mailmap: Federico Gimenez affiliation

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

unittest_shared_cache: fix build line

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

Merge remote-tracking branch 'gh/giant'

Conflicts:
src/test/common/test_shared_cache.cc

doc/release-notes: giant notes

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

Merge pull request #2630 from ceph/wip-9545

os/FileStore: do not loop in sync_entry on shutdown

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

rgw_rest_client.cc: remove self assignment of new_info.effective_uri

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge branch 'wip-da-SCA-20141025'

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

test/librbd/fsx.c: fix indentation (NESTING_INDENT_MISMATCH)

Fix indentation to the same as the original fsx.c .

Fix for Coverity issue:

CID 1219473 (#1-2 of 2): Nesting level does not match indentation
(NESTING_INDENT_MISMATCH)
 uncle: This statement is indented to column 25, as if it were
 nested within the preceding parent statement, but it is not.

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

libradosstriper/striping.cc: fix strdup memory leaks

Fix memory leak caused by using std::string to hold result
of strdup call returned from getObjName().

Fix for Coverity issues:

CID 1221525 (#1 of 1): Resource leak (RESOURCE_LEAK)
 leaked_storage: Failing to save or free storage allocated by
 this->getObjName(soid, 0UL) leaks it.

CID 1221526 (1-3 of 3): Resource leak (RESOURCE_LEAK)
 leaked_storage: Failing to save or free storage allocated by
 this->getObjName(soid, *) leaks it.

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

test/libradosstriper/striping.cc: fix wrong indentation

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

msg/async/Event.cc: use static_cast instead of c-style cast

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

rgw/rgw_formats.cc: fix realloc memory leak

Fix handling of realloc. If realloc() fails it returns NULL, assigning
the return value of realloc() directly to the pointer without checking
for the result will lead to a memory leak in error case.

Use a temporary pointer to hold the result of realloc(). In error case
print error and exit, otherwise assign it to the pointer we want to realloc.

Fix also error checks for malloc to fail as soon as malloc fails and
don't try to run realloc again after failed malloc.

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

arch/neon.c: check result of fread()

Fix for:

CID 1128384 (#1 of 1): Ignoring number of bytes read (CHECKED_RETURN)
 check_return: fread(void * restrict, size_t, size_t, FILE * restrict)
 returns the number of bytes read, but it is ignored.

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

cls_rgw_client.cc: fix potential null pointer deref

Fix for:

CID 1054853 (#1 of 1): Dereference before null check (REVERSE_INULL)
 check_after_deref: Null-checking is_truncated suggests that it may
 be null, but it has already been dereferenced on all paths leading
 to the check.

Add vim line to file.

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

SyntheticClient.cc: check return value of getdir()

Check return value as done in all other places. Fix error messages
to print correct function name getdir and not read_dir/readdir since
the error isn't necessarily raised by read_dir().

Fix for:
CID 1219463 (#1 of 1): Unchecked return value (CHECKED_RETURN)
 check_return: Calling getdir without checking return value (as
 is done elsewhere 4 out of 5 times).

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

SyntheticClient.cc: remove empty lines in if/else blocks

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

test_rbd_replay.cc: fix va_list parameter handling

Fix for:

[src/test/test_rbd_replay.cc:193]: (portability) Passing NULL after the
last typed argument to a variadic function leads to undefined behaviour.

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

AsyncConnection.cc: prefer ++operator for non-primitive iterators

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

mon_store_converter.cc: move convert() call out of assert()

The convert() call is changing data. To prevent Heisenbugs
depending in NDEBUG definition (e.g. if debug is off).

Move convert() call out of the assert call and use assert
only on the result value of the call.

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

test_str_map.cc: remove unused variable

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

rgw/rgw_rest_user.cc: reduce scope of key_type

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

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

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

rgw/rgw_rest_s3.cc: use !empty() instead of size() > 0

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

Merge pull request #2805 from xinxinsh/wip-check-trimmed-pg-log

check to_remove before setting transaction

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

Merge pull request #2808 from ceph/wip-crush-link-id

mon: fix `osd crush link` id resolution

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

Merge pull request #2589 from majianpeng/bug-fix

Clock: Using clock_gettime instead of gettimeofday in linux os.

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

Merge pull request #2806 from zhouyuan/lrc_dead_code

Remove dead code in EC LRC plugin

Reviewed-by: Loic Dachary <loic-201408@dachary.org>

mon: fix `osd crush link` id resolution

A junk value for ID was falling through from
the outer scope.  Rename the outer one to
`osdid` and look up `id` explicitly in crush link.

For a bonus also add an error string for when
link_bucket returns an error (previously
would get plain "Error EINVAL")

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

Remove dead code in EC LRC plugin

The layer_minimum_to_decode() seems to be dead.

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

check to_remove before setting transaction

currently if you dump transaction for a single rbd write, a transaction
of OMAP_RMKEYS will be listed even if to_remove is empty.

Signed-off-by: xinxin shu <xinxin.shu@intel.com>

Merge pull request #2800 from ceph/wip-enoent-race

os/LevelDBStore, RocksDBStore: fix race handling for get store size

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>

rgw/rgw_rados.cc: remove unused variable 'objs'

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

osd/ReplicatedPG.cc: use !empty() instead of size() > 0

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

PGLog.cc: reduce scope of variable

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

common/escape.c: add cppcheck-suppress

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

fuse_ll.cc: use reinterpret_cast instead of c-style cast

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

JournalScanner.cc: reduce scope of local variable

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

test_disk_bw.cc: reduce scope of variable

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

objectstore/store_test.cc: reduce scope of variable

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

TestErasureCodeIsa.cc: reduce scope of 'err' variable

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

TestCrushWrapper.cc: reduce scope of variabele

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

test_sharedptr_registry.cc: reduce scope of local variable

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

test_shared_cache.cc: reduce scope of local variable

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

TestSignalHandlers.cc: add cppcheck-suppress nullPointer

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

rgw_rest_user.cc: reduce scope of key_type in several places

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

rbd-replay-prep.cc: reduce scope of variable

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

osd/ReplicatedPG.cc: reduce scope of variable

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

osd/PGLog.cc: reduce scope of variable, remove not needed code

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

osd/PG.h: add cppcheck-suppress

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

os/chain_xattr.cc: reduce scope of some variables

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

os/KeyValueStore.cc: reduce scope of variables

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

os/HashIndex.cc: reduce scope of variable

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

mon/OSDMonitor.cc: reduce scope of variable

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

mds/Server.cc: reduce scope of variable

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

mds/MDS.cc: remove unused local variable

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

ErasureCodeLrc.cc: reduce scope of variable

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

ErasureCodeIsa.cc: reduce scope of variable

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

ErasureCodePlugin.cc: reduce scope of variable

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

cls_rbd_client.cc: reduce scope of variable

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

mailmap: Federico Gimenez affiliation

Signed-off-by: Loic Dachary <loic-201408@dachary.org>

Merge pull request #2753 from dachary/wip-mailmap

mailmap updates

os/LevelDBStore, RocksDBStore: fix race handling for get store size

If we get ENOENT, skip this file, instead of adding in undefined stat
values.

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

doc/release-notes: v0.87 giant (draft)

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

Merge pull request #2763 from ceph/wip-da-SCA-20141010

Some fixes from SCA runs

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

Paxos.cc: use reinterpret_cast instead of c-style cast

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

fuse_ll.cc: use reinterpret_cast instead of c-style cast

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

librados.cc: use static_cast instead of c-style cast

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

Merge pull request #2799 from athanatos/wip-9480

Wip 9480

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

Merge pull request #2798 from athanatos/wip-9875

ReplicatedPG: writeout hit_set object with correct prior_version

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

Merge pull request #2789 from ceph/wip-rgw-explicit-reason

rgw: send http status reason explicitly in fastcgi

Merge remote-tracking branch 'gh/giant'

Revert "Enforce cache size on read requests"

This reverts commit 4fc9fffc494abedac0a9b1ce44706343f18466f1.

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

Revert "osdc: Fix ObjectCounter::_readx perf counters"

This reverts commit 830373ef018a78c3fe9d1b9ade208249fe8ccc6a.

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

Revert "osdc: Fix compiler warning"

This reverts commit cb290a117ae17961c9e43e5fe76bb3edb2ed7efa.

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

Revert "rbd: ObjectCacher reads can hang when reading sparse files"

This reverts commit cdb7675a21c9107e3596c90c2b1598def3c6899f.

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

Revert "Fix read performance regression in ObjectCacher"

This reverts commit 65be257e9295619b960b49f6aa80ecdf8ea4d16a.

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

.gitmodules: ignoring changes in rocksdb submodule

Signed-off-by: Federico Gimenez <fgimenez@coit.es>
(cherry picked from commit 60eaeca4ddccc79b29b17ad433c6569cb2a89500)

Merge pull request #2797 from ceph/wip-rbd-revert

rbd/objectcacher: revert recent changes for giant

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

Revert "Enforce cache size on read requests"

This reverts commit 4fc9fffc494abedac0a9b1ce44706343f18466f1.

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