mailmap: Bjørnar Ness affiliation

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

mailmap: Ron Allred affiliation

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

mailmap: Steve Stock affiliation

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

mailmap: Christopher O'Connell affiliation

Reviewed-by: Christopher O'Connell <jwriteclub@gmail.com>
Signed-off-by: Loic Dachary <loic@dachary.org>

mailmap: Mike Lundy affiliation

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

mailmap: Mouad Benchchaoui affiliation

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

mailmap: Andrey Kuznetsov affiliation

Reviewed-by: Andrey Kuznetsov <Andrey_Kuznetsov@epam.com>
Signed-off-by: Loic Dachary <loic@dachary.org>

mailmap: Wang, Yaguang affiliation

and name normalization

Reviewed-by: Wang, Yaguang <yaguang.wang@intel.com>
Signed-off-by: Loic Dachary <loic@dachary.org>

mailmap: The Linux Box affiliations

Matt Benjamin, Adam C. Emerson and Casey Bodley are with The Linux Box

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

Merge pull request #1334 from kazhang/wip-get-hit_set-parameter

OSDMonitor: enable getting hit set parameters

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

OSDMonitor: enable getting hit set parameters
We would like to get the hit set parameters: hit_set_type |
hit_set_period | hit_set_count | hit_set_fpp via OSDMonitor

Signed-off-by: Kai Zhang <zakir.exe@gmail.com>

Merge pull request #1333 from ceph/wip-s3radoscheck-wusui

Use pgrep radosgw to determine if rados gateway is running.

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

Use pgrep radosgw to determine if rados gateway is running.
Fixes: 7528
Signed-off-by: Warren Usui <warren.usui@inktank.com>

Merge pull request #1323 from ceph/wip-requests-dependencies

Fix python-requests package dependencies.

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

Fix python-requests package dependencies.

python-ceph does not require requests, but ceph-common does (for ceph-brag).

Signed-off-by: Dan Mick <dan.mick@inktank.com>

Merge pull request #1263 from ceph/wip-mds-dumper

mds: Dumper improvements

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

mds: Add dump-journal-entries

This adds a somewhat-human-readable peer to
the 'dump-journal' command.

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

mds: Create MDSUtility as base for Dumper/Resetter

These classes has lots of similar functionality and we may
want to add more similar things in the future.

Also, get a copy of the MDS map at startup
to learn the ID of the metadata pool instead of
assuming it's the default.

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

mds: Fix Dumper shutdown

It was shutting down messenger before monclient.  This
caused a sometimes-assertion when monclient tried to
reconnect in response to ms_handle_reset.

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

Merge pull request #1283 from ceph/wip-7485

mon/MDSMonitor: Cope with failures during creation

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

Merge pull request #1264 from ceph/wip-mds-dencoder

mds: Add encode/decode/dump for use with dencoder

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

Merge pull request #1280 from ceph/wip-7374-wusui

Fix sub check() to not exit if rgw is running.

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

Merge pull request #1279 from ceph/wip-7375-wusui

Fixed sub check() to say okay if rgw is running.

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

Fixed get_status() to find client.radosgw fields inside of ps output.
Fixes: 7375
Signed-off-by: Warren Usui <warren.usui@inktank.com>

Fix get_status() to find client.rados text inside of ps command results.
Added port (fixed value for right now in teuthology) to hostname.
Fixes: 7374
Signed-off-by: Warren Usui <warren.usui@inktank.com>

mds: add mds_kill_create_at for testing

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

Merge pull request #1303 from ceph/port/temp-failure-retry

compat: avoid unused warn with TEMP_FAILURE_RETRY

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

compat: avoid unused warn with TEMP_FAILURE_RETRY

The version of TEMP_FAILURE_RETRY found on Linux has a GNU extension
that squashes the unused return value warning where applicable. This
adds a VOID_TEMP_FAILURE_RETRY to make the case explicit, casting the
expression value to void to avoid the warning.

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

Merge pull request #1287 from kdreyer-inktank/redhat-files

packaging: file list adjustments

Tested-by: Huang Jun <hjwsm1989@gmail.com>

Merge pull request #1265 from ceph/wip-mds-misc

MDS misc. cleanup

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

os/ObjectStore: fix rebase errors

These were goofed by d74f1282cd268b4b04cfd9e90ddeac6d1dc6be7e.

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

README: add build dep

Technically it's a 'make check' dep, but close enough.

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

Merge remote-tracking branch 'gh/firefly'

Merge pull request #1290 from ceph/wip-os-doc

os/ObjectStore: document interface

os/ObjectStore: document interface

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>

Merge pull request #1294 from ceph/wip-librados-object-iterator

fix bugs in librados::ObjectIterator

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

Merge pull request #1295 from yuyuyu101/keyvaluestore-enhance

Keyvaluestore enhance(backport to firely)

Pulling this into firefly because it doesn't (substantiatively) touch anything outside of KeyValueStore.

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

Merge pull request #1297 from ceph/wip-ec-bugs

Wip ec bugs

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

unittest_ecbackend: fix signed/unsigned warnings

In file included from test/osd/TestECBackend.cc:20:0:
../src/gtest/include/gtest/gtest.h: In instantiation of ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = long unsigned int; T2 = int]’:
../src/gtest/include/gtest/gtest.h:1300:30: required from ‘static testing::AssertionResult testing::internal::EqHelper::Compare(const char*, const char*, const T1&, const T2&) [with T1 = long unsigned int; T2 = int; bool lhs_is_null_literal = false]’
test/osd/TestECBackend.cc:30:281: required from here
warning: ../src/gtest/include/gtest/gtest.h:1263:3: comparison between signed and unsigned integer expressions [-Wsign-compare]

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

Merge pull request #1301 from ceph/wip-scrub-primary

mon/PGMonitor: fix primary osd check on deep-scrub

gitbuilders are now passing

mon/PGMonitor: fix primary osd check on deep-scrub

s/!=/==/.  Logic was reversed.

Broken in 40bdcb88504aea6288d461d29d24d5b0bf7aeebc.

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

Merge pull request #1300 from ceph/wip-7513

PGLog::activate_not_complete typo

Reviewed-by: David Zafman <david.zafman@inktank.com>

PGLog::activate_not_complete: fix log.complete_to increment typo

info.last_complete should be the entry before log.complete_to.

This appears to have been a typo introduced in
dd71051a8f6ec611b3559f8e2aff3c001be37792.

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

Merge pull request #1298 from ceph/wip-subscribe

osd: fix off-by-one is boot subscription

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

Merge pull request #1299 from ceph/wip-repair

osd/PG: fix assert when a shallow repair has fixed all errors.

Reviewed-by: David Zafman <david.zafman@inktank.com>

osd/PG: fix assert when deep repair finds no errors

If there are no deep repairs, we don't want to assert.
Fixes:

    -1> 2014-02-21 21:13:56.393087 7f0258ff9700  0 log [INF] : 0.0 repair ok, 0 fixed
     0> 2014-02-21 21:13:56.428703 7f0258ff9700 -1 osd/PG.cc: In function 'void PG::scrub_finish()' thread 7f0258ff9700 time 2014-02-21 21:13:56.393127
osd/PG.cc: 4294: FAILED assert(deep_scrub)

Signed-off-by: David Zafman <david.zafman@inktank.com>
Signed-off-by: Sage Weil <sage@inktank.com>

PGLog: test for missing using the correct shard value

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

OSD: fix query for ec pgs

We need to parse a pg_t and translate it into an spg_t.

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

Objecter: make is_pg_changed static and const for old/newacting

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

OSDMap: make calc_pg_rank/role const for acting

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

Objecter: resend op if primary role changed

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

ECTransaction: require hash_infos for deleted objects

Otherwise, an append preceded by a delete may not see the
correct HashInfo state since it won't have been cached
until the delete is applied.

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

ECUtil: clear() should reset hashes to -1, not 0

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

ReplicatedPG::cancel_pull: ECBackend might cancel_pull on a non-missing object

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

ECBackend::filter_read_op: clean up read state properly

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

osd: fix off-by-one is boot subscription

If we have osdmap N, we want to onetime subscribe
starting at N+1.  Among other things, it means we
hear when the NOUP flag is cleared.

This appears to have broken somewhere around
3c76b81f2f96b790b72f2088164ed8e9d5efbba1.

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

Rename keyvaluestore_check_backend to keyvaluestore_debug_check_backend

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

Add KeyValueStore op thread options

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

Remove eio inject codes in KeyValueStore

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

Add config tracker to KeyValueStore

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

Add backend check option to KeyValueStore

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

Remove filestore_inject_stall

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

Remove m_eio in KeyValueStore

KeyValueStore use kv backend to detect errors and nearly can't know the actual
reason for error.

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

Make SequencePosition sync by each transaction

Each object modify will increase SequencePosition and sync it to disk

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

Implement collection_rename interface in KeyValueStore

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

Remove unnecessary "check_coll" check

The goal of "check_coll" is aimed to ensure the collection is exists. But
the create and delete of collection already ensured by OSD, just remove check.

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

Optimize write call add enhance error detect

A single write call may need several keys in the backend kv store. Let get these
keys one time.

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

Unify object level lock in GenericObjectMap

Before we copy lock implementation from DBObjectMap which provide with two locks
for header. Here just unify it to make ease.

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

Fix incorrect read and truncate

If the first chunk of object is not read entirely, the current implementation
will contain it entirely which make wrong.

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

Return 0 when the offset of read exceed the length of object

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

Add read/write operation to store_test.cc

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

Adjust some interfaces to optimize caller codes

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

Use rename operation to make colection_move atomic

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

Add get_*_with_header to StripObjectHeader

In some situations, we need to ensure header is held and try to read, so read
interfaces need to accept header argument to allow.

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

Add test for omap interface

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

Move perf counter and add op queue reserve throttle

The perf counter of FileStore can shared with other ObjectStore backend, so move
it to ObjectStore and adjust position to let other KeyValueStore refer to.

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

Fix deadlock caused by hold collection obj

Collection is a special object in KeyValueStore, if exists collection modify,
this object will be hold. When exists check collection, it will be dead lock to
try to access this object.

Now lookup transaction cache first to ensure no collection object exists
already.

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

Merge branch 'wip-6685-firefly' into firefly

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

Merge pull request #1293 from jwriteclub/doc-update-ceph-osd-note

Added a note that the ceph-osd command requires the cluster option.

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

Added a note that the ceph-osd command requires the cluster option.

Signed-off-by: Christopher O'Connell <jwriteclub@gmail.com>

librados: implement ObjectIterator copying and assignment

Copied iterators should be independent of each other, and not
rely on the same underlying ListContext or ObjListCtx.

Add some tests for this to make sure they work in various
circumstances.

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

Merge remote-tracking branch 'origin/wip-da-SCA-20140218' into firefly

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

Added evaluation of cluster and fixed evaluation when setting initial weight on start in verbose mode

Signed-off-by: Christopher O'Connell <jwriteclub@gmail.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

librados: don't destroy ObjListCtx when iterator reaches the end

There's no need to destroy it when we've used it once. It'll get destroyed
by the destructor anyway. Now that there's a seek method, we might want seek
and iterate again anyway, which is not possible if the ObjListCtx is gone.

Change get_next() to check the underlying ObjListCtx for the end of iteration
instead of deleting ObjListCtx, and modify the equality operator to count
the end marker (with ctx == NULL) as equal to having a ObjListCtx at the
end of its list.

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

librados: remove extra advance from objects_begin(position)

ObjectIterator::seek() already calls get_next() to update the
iterator's state. Calling it again goes one past where it should be.

When the iterator reached the end of the list, it deleted the ListCtx,
causing a segfault on further accesses.

Fixes: #7491
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

Merge pull request #1286 from ceph/wip-corpus

ceph-object-corpus: prune some old releases

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

Revert "ReplicatedPG::recover_backfill: adjust last_backfill to HEAD if snapdir"

This reverts commit 545135f3e1c75318940caa2c82ac32a53fc4f957.

Conflicts:

src/osd/ReplicatedPG.cc

Merge remote-tracking branch 'origin/port/updates' into firefly

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

packaging: match all test files

It's tedious to try to keep the list of test files up to date in the RPM
spec file. Use a wildcard to match them all.

Reported-by: huangjun <hjwsm1989@gmail.com>
Signed-off-by: Ken Dreyer <ken.dreyer@inktank.com>

packaging: add missing file

Signed-off-by: huangjun <hjwsm1989@gmail.com>
Reviewed-by: Ken Dreyer <ken.dreyer@inktank.com>

ceph-object-corpus: prune some old releases

We do not need to test these old object encodings as they are covered by
later object collections.

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

Merge remote-tracking branch 'origin/wip-6936' into firefly

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

Merge remote-tracking branch 'origin/wip-7099' into firefly

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

Merge remote-tracking branch 'origin/wip-6830' into firefly

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

Merge remote-tracking branch 'origin/wip-6951' into firefly

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

Merge remote-tracking branch 'origin/wip-7064' into firefly

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

Merge remote-tracking branch 'origin/wip-7271' into firefly

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

dencoder: check for radosgw build option

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

osd: use ceph scoped shared_ptr

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

mon/MDSMonitor: Cope with failures during creation

Previously an MDS which failed in state CREATING could be
assigned the sequence BOOT->STANDBY->REPLAY at its next
startup, which fails to re-try the creation.

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