librbd: Fix image_watcher test

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

Librbd: Don't affect global md_config_t

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

Librbd: Don't apply to global configserver

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

Librbd: aware_metadata_confs->apply_metadata_confs

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

Librbd: Use boost:assign to init aware_confs

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

Librbd: Discard all global config used for image

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

Librbd: Make image aware of more configs

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

Librbd: Add existing rbd configs to aware table

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

Librbd: Add tests for aware metadata config

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

Librbd: Add basic metadata aware method

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

Merge pull request #4209 from ceph/wip-java

fix rhel linking error

Backport: giant, firefly, dumpling

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

java: libcephfs_jni.so is in /usr/lib64 on rhel

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>

java: dump extra info for ftruncate assertion

Nightly ran and encountered a situation in which fstat following
ftruncate reported a size not equal to the truncated size.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>

Merge pull request #4203 from Vicente-Cheng/fixed-get-mdsmap-assertion

mds: fixed the ceph get mdsmap assertion.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #4173 from ceph/wip-mds-kill-session

Wip mds kill session

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: John Spray <jspray@redhat.com>

Merge pull request #4168 from ceph/wip-11226-dir-fx

RFC client: Hold on to exclusive caps on directories we "own"

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

Merge pull request #4177 from ceph/wip-11226-extra

Wip 11226 extra

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #4189 from ceph/wip-11236

test_libcephfs: do cleanup in ReleaseMounted test

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #4192 from ceph/wip-11218

#11218: Multi-MDS fixes for 'damaged' ranks

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #4199 from ceph/wip-11250

cls_rbd: fix read past end of bufferlist c_str() in debug log msg

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #4200 from ceph/wip-mds-remove-inode

mds: properly remove inode after purging stray

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

Fixed the ceph get mdsmap assertion.

    When we want to get mdsmap, we try to get_version()
    and the return value err = 0 means success.

    The assert verified r == 0. r would not change in this flow.
    It always meet assert and lead mon failure.

    I think this verify should be:
        assert(err == 0)
    It will help to check return value of get_version().

If you have any questions, feel free to let me know.
Thanks!

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

Merge pull request #4193 from larkly/patch-docerror-erasure

doc: Incomplete example in erasure-coded-pool.rst

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

mds: properly remove inode after purging stray

Signed-off-by: Yan, Zheng <zyan@redhat.com>

cls_rbd: fix read past end of bufferlist c_str() in debug log msg

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

Merge pull request #4171 from majianpeng/cleanup

common: print hexadecimal for ghobject_t.generation.

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

Doc: Incomplete example in erasure-coded-pool.rst

Signed-off-by: Bosse Klykken <larkly@gmail.com>

Merge pull request #4113 from wonzhq/rbd-fix

rbd: misc fixes

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

mds: include damaged in MDSMap::dump

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

mds: update peer failure response to account for damaged

...by calling get_down_mds_set instead of get_failed_mds_set.

Also remove a redundant if(true) around this region.

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

mds: add get_down_mds_set method

For places where we would like to treat failed
and damaged MDS ranks the same, like detecting
when someone has dropped offline.

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

mds: account for 'damaged' in MDSMap::is_degraded

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

mds: clarify MDBalancer::send_heartbeat

The initial is_degraded() check guarantees that
the 'in' set is equal to the 'up' set.  Later,
this calls get_mds_set and assigns it to a variable
called 'up'.

It's clearer to use get_up_mds_set into the variable
called up (this was confusing when debugging #11218
which was itself a result of is_degraded() ignoring
damaged ranks).

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

test_libcephfs: do cleanup in ReleaseMounted test

Fixes: #11236
Signed-off-by: Yan, Zheng <zyan@redhat.com>

Merge pull request #4188 from XinzeChi/wip-test-1

test: add compile-command for test_ceph_daemon.py

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

test: add compile-command for test_ceph_daemon.py

Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>

common: print hexadecimal for ghobject_t.generation & shard_id

In filestore, it use hexadecimal for ghobject_t.generation &
shard_id. Make the same.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

Merge pull request #4181 from ceph/wip-rpm-systemd-conditional-syntax

ceph.spec.in: fix _with_systemd conditional

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

Merge pull request #4182 from ceph/wip-replicatedpg-signed

ReplicatedPG: fix a signed/unsigned comparison warning

Reviewed-by: Samuel Just <sjust@redhat.com>

ReplicatedPG: fix a signed/unsigned comparison warning

This mismatch about whether pool IDs are signed or unsigned is
a persistent annoyance. I'm now casting the unsigned down to signed space
because apparently the OSD is using negative IDs for temporary object
namespaces.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>

ceph.spec.in: fix _with_systemd conditional

The RPM conditional needs a "?" in the event that it is not defined.

client: Hold on to exclusive caps on directories we "own"

If a directory is complete, we *really* want to keep the exclusive cap
so that we don't end up needing to do MDS lookup requests on every cache
miss.

Fixes: #11226
Signed-off-by: Greg Farnum <gfarnum@redhat.com>

Merge remote-tracking branch 'gh/hammer'

Conflicts:
src/gmock

Merge pull request #3688 from XinzeChi/wip-clear-transaction

osd: new transcation if needed

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

Merge pull request #3870 from majianpeng/cache-tier

Cache tier bug fixs

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

Merge pull request #3679 from mslovy/wip-findObjectContext-opt

ReplicatedPG:: find_object_context clear extra creation (head,snapdir)

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

Merge pull request #4065 from majianpeng/pgop-memleak

osd/ReplicatedPG: Fix a memory leak in do_pg_op.

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

Merge pull request #3974 from majianpeng/fgetattr-fix

os/FileStore: For getxattr, enlarge the value size avoid try again.

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

Merge pull request #3604 from yghannam/yazen-testing

crc32c: add aarch64 optimized crc32c implementation

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

Merge pull request #4073 from jdurgin/wip-lttng-daemon

common, global: use lttng ust functions for handling fork-like calls

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

Merge pull request #3916 from ceph/wip-rpm-no-ghost-socket-dir

ceph.spec.in: fix handling of /var/run/ceph

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

Merge pull request #4000 from ceph/wip-da-SCA-20150312

Fixes for Covertity issues

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

Merge pull request #4128 from dzafman/wip-11139-hammer

ceph-objectstore-tool: Use exit status 11 for incompatible import attemp...

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #4124 from ceph/wip-omap-clear

osd: fix omap_clear handling

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #4179 from ceph/wip-11065

unit/tox tests structure for ceph-disk

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

ceph-disk: add test files to EXTRA_DIST

Signed-off-by: Alfredo Deza <adeza@redhat.com>

ceph-disk: remove double import

Signed-off-by: Alfredo Deza <adeza@redhat.com>

ceph-disk: create initial structure for tox/unit tests

Signed-off-by: Alfredo Deza <adeza@redhat.com>

client: conclude -ENOENT when there is null dentry

Signed-off-by: Yan, Zheng <zyan@redhat.com>

client: don't clear COMPLETE flag when trimming null dentry

Signed-off-by: Yan, Zheng <zyan@redhat.com>

mds: make sure readdir reply include Fs cap for directory

filelock in LOCK_XSYN state does not allow Fs cap. so client can't
mark directory as complete when handling the readdir reply.

Signed-off-by: Yan, Zheng <zyan@redhat.com>

Merge pull request #4170 from ceph/hammer-11205

qa/workunits/fs/misc: fix filelock_interrupt.py

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

qa/workunits/fs/misc: fix filelock_interrupt.py

Handle the case that kernel does not support fcntl.F_OFD_SETLK.
Also fix the code that checks if fnctl fails with errno == EINTR.

Fixes: 11205
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 4ececa3dc4a21b98f61a592da9e2be60a0d71625)

mds: drop replayed requests when seesion is closed

Signed-off-by: Yan, Zheng <zyan@redhat.com>

mds: fix crash when killing busy session

journal_close_session() has already freed pending_prealloc_inos

Signed-off-by: Yan, Zheng <zyan@redhat.com>

Merge pull request #4162 from athanatos/wip-11156

ReplicatedPG::promote_object: check scrubber and block if necessary

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

Merge pull request #4164 from athanatos/wip-revert-degraded-writes-release-notes

release-notes.rst: update for degraded writes revert

release-notes.rst: update for degraded writes revert

Signed-off-by: Samuel Just <sjust@redhat.com>

Merge pull request #4163 from athanatos/wip-revert-degraded-writes

Wip revert degraded writes

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

Merge pull request #4161 from trhoden/cephdeploy_not_new

doc: no longer call out ceph-deploy as new

doc: no longer call out ceph-deploy as new

The tip declaring ceph-deploy as new doesn't really apply anymore.

Signed-off-by: Travis Rhoden <trhoden@redhat.com>

Merge pull request #4154 from XinzeChi/wip-test-lfn-index

bug fix: test case for lfn index

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

Merge pull request #4150 from javierguerragiraldez/master

libradosstriper: declare libradosstriper library dependencies

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

Merge pull request #4157 from majianpeng/cleanup

librados: remove the unused flags.

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

librados: remove the unused flags.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

bug fix: test case for lfn index

tests: TestFlatIndex.cc races with TestLFNIndex.cc
Both use the same PATH and when run in parallel they sometime conflict.

Fixes: #11217
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>

Merge pull request #4099 from rajukv/xio-bugfix

XIO: Handle queued incoming XIO messages during retry

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

Merge pull request #4152 from ceph/wip-11145

rgw: shut down timer before erroring out

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

doc/release-notes: draft hammer release notes

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

be gender neutral

Signed-off-by: Alexandre Marangone <amarango@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

rgw: shut down timer before erroring out

Fixes: #11145
Backport: hammer

Clean up initialization timer, otherwise if we error out, we'll assert.

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

Declare libradosstriper library dependencies

When omitted, trying to dynamically load libradosstriper results in "undefined symbol" errors.

Signed-off-by: Javier Guerra <javier@guerrag.com>

Merge pull request #4081 from ian-kelling/master

doc: consistent alternate cluster name arguments

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

ReplicatedPG::promote_object: check scrubber and block if necessary

Otherwise, we might attempt to promote into an in-progress scrub
interval causing 11156.  I would have added a return value to
promote_object(), but could not find an existing user which
cared to distinguish the cases, even with a null op passed.
All existing users are in maybe_handle_cache.  The ones which
pass a null op are for promoting the object in parallel
with a proxy -- a case where not actually performing the promote
does not really matter.

Fixes: #11156
Signed-off-by: Samuel Just <sjust@redhat.com>

Merge pull request #4148 from dobbler123/master

doc: Fixes spelling and grammatical errors

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

doc: Fixes spelling and grammatical errors

Signed-off-by: Vartika Rai <vartikarai17@gmail.com>

Merge pull request #4146 from rlrevell/wip-doc-rlrevell-clarify-nova-instructions

doc: Clarify the requirement that the cinder user's key must be present ...

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

Merge pull request #4147 from rlrevell/wip-doc-rlrevell-correct-git-instructions

doc: Correct git push instructions adding branch name

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

Merge pull request #4009 from objoo/for-hammer

mailmap: v.0.94 updates

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

doc: Correct git push instructions adding branch name

Signed-off-by: Lee Revell <rlrevell@gmail.com>

Merge pull request #4056 from dmitryya/issue_11140

rgw: init script in stop action waits until the radosgw stops

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

Merge remote-tracking branch 'gh/hammer'

Conflicts:
src/gmock

rgw: init script waits until the radosgw stops

Fixes: #11140
Init script waits in stop action until the radowgw daemons stop.

Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>

doc: Clarify the requirement that the cinder user's key must be present on the compute nodes

Signed-off-by: Lee Revell <rlrevell@gmail.com>

Merge pull request #4125 from dzafman/wip-11176-hammer

ceph-objectstore-tool: Output only unsupported features when incomatible

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

Merge pull request #4086 from tchaikov/fix-doxygen-warnings

doc: fix doxygen warnings

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

Merge pull request #4145 from ceph/wip-hammer-rgw

Wip hammer rgw

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

osd/: s/is_degraded_object/is_degraded_or_backfilling_object

Currently, this method also returns true if the object is backfilling.
This commit was reverted earlier in the branch in order to make the
other reverts clean.  It's actually a nice rename though, so I'm
re-cherry-picking it.

Signed-off-by: Samuel Just <sjust@redhat.com>
Conflicts:
src/osd/ReplicatedPG.cc

Revert "osd/: update peer_missing and local missing if we write a degraded object"

This reverts commit c632fecb87e292eb73161f36d4e6df6f077fae77.

Revert "append_log: use remove_snap_mapped_object"

This reverts commit 964d17756f9e49002eb96c4f27a3f41da0880f71.