]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agoPendingReleaseNotes: make a note about KeyValueStore on-disk format change
Sage Weil [Fri, 21 Aug 2015 21:50:42 +0000 (17:50 -0400)]
PendingReleaseNotes: make a note about KeyValueStore on-disk format change

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #5611 from ceph/wip-newstore-misc
Sage Weil [Fri, 21 Aug 2015 21:53:58 +0000 (17:53 -0400)]
Merge pull request #5611 from ceph/wip-newstore-misc

osd: final prereq patches for newstore

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #5634 from ceph/wip-fix-FTBFS-boost
Gregory Farnum [Fri, 21 Aug 2015 13:49:53 +0000 (14:49 +0100)]
Merge pull request #5634 from ceph/wip-fix-FTBFS-boost

rbd: fix the FTBFS on old boost introduced by 2050d08

10 years agorbd: fix the FTBFS on old boost introduced by 2050d08 5634/head
Kefu Chai [Fri, 21 Aug 2015 13:40:59 +0000 (21:40 +0800)]
rbd: fix the FTBFS on old boost introduced by 2050d08

in boost 1.49, BOOST_SCOPE_EXIT() does not accept capture_tuple,
only `(capture) (capture) ...` is supported.

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #5583 from ceph/wip-12676
Gregory Farnum [Fri, 21 Aug 2015 12:11:46 +0000 (13:11 +0100)]
Merge pull request #5583 from ceph/wip-12676

mds: check mds up before calling MDSMap::get_mds_info

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #5587 from caibo2014/master
Kefu Chai [Fri, 21 Aug 2015 11:33:59 +0000 (19:33 +0800)]
Merge pull request #5587 from caibo2014/master

rbd: remove the output file if rbd export-diff fails

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #5632 from ceph/wip-fix-ftbfs-4998
Gregory Farnum [Fri, 21 Aug 2015 11:22:34 +0000 (12:22 +0100)]
Merge pull request #5632 from ceph/wip-fix-ftbfs-4998

osd: fix the FTBFS introduced by be28319

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoosd: fix the FTBFS introduced by be28319 5632/head
Kefu Chai [Fri, 21 Aug 2015 09:20:38 +0000 (02:20 -0700)]
osd: fix the FTBFS introduced by be28319

the signature of Scrubber::write_blocked_by_scrub() was changed in #5470.

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4998 from wonzhq/hitset-remove-all
Kefu Chai [Fri, 21 Aug 2015 08:51:46 +0000 (16:51 +0800)]
Merge pull request #4998 from wonzhq/hitset-remove-all

osd: implement hit_set_remove_all

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoosd: only remove all the hit set objects on primary osd 4998/head
Zhiqiang Wang [Thu, 23 Jul 2015 01:26:44 +0000 (09:26 +0800)]
osd: only remove all the hit set objects on primary osd

Only the primary PG is allowed to remove all the hit set objects. And
the PG should be in the active or peered states.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agoosd: no need to check current hitset object is degraded when persisting
Zhiqiang Wang [Thu, 18 Jun 2015 04:36:45 +0000 (12:36 +0800)]
osd: no need to check current hitset object is degraded when persisting
hit set

The current hit set object doesn't exist yet. We are about to create it.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agoosd: implement hit_set_remove_all
Zhiqiang Wang [Thu, 18 Jun 2015 01:05:28 +0000 (09:05 +0800)]
osd: implement hit_set_remove_all

When hit set is not configured on startup or on a change, remove all
previous hitsets.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agoMerge pull request #5315 from tchaikov/wip-10930
Kefu Chai [Fri, 21 Aug 2015 03:18:32 +0000 (11:18 +0800)]
Merge pull request #5315 from tchaikov/wip-10930

mon: remove osd_epoch to avoid out-dated osdmap_cache

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #5579 from jbweber/s3_encoding_type
Yehuda Sadeh [Thu, 20 Aug 2015 22:45:53 +0000 (15:45 -0700)]
Merge pull request #5579 from jbweber/s3_encoding_type

rgw: implement s3 encoding-type for get bucket

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: implement s3 encoding-type for get bucket 5579/head
Jeff Weber [Wed, 5 Aug 2015 23:06:46 +0000 (19:06 -0400)]
rgw: implement s3 encoding-type for get bucket

This change introduces handling for the encoding-type request
parameter on the get bucket operation. An object key may contain
characters which are not supported in XML. Passing the value "url" for
the encoding-type parameter will cause the key to be urlencoded in the
response.

Fixes: #12735
Signed-off-by: Jeff Weber <jweber@cofront.net>
10 years agoMerge branch 'dont-cache-recovery' of git://github.com/yuyuyu101/ceph
Sage Weil [Thu, 20 Aug 2015 19:20:44 +0000 (15:20 -0400)]
Merge branch 'dont-cache-recovery' of git://github.com/yuyuyu101/ceph

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
# Conflicts:
# src/osd/ReplicatedBackend.cc
# src/osd/ReplicatedBackend.h
# src/osd/ReplicatedPG.cc

10 years agoMerge pull request #5259 from branch-predictor/bp-tuned-bufferlists
Sage Weil [Thu, 20 Aug 2015 19:09:17 +0000 (15:09 -0400)]
Merge pull request #5259 from branch-predictor/bp-tuned-bufferlists

Bufferlist tuning

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #5518 from ceph/wip-12652
Sage Weil [Thu, 20 Aug 2015 18:53:30 +0000 (14:53 -0400)]
Merge pull request #5518 from ceph/wip-12652

osd/PGLog: dirty_to is inclusive

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #5539 from wonzhq/flush-mode-stat
Sage Weil [Thu, 20 Aug 2015 18:47:24 +0000 (14:47 -0400)]
Merge pull request #5539 from wonzhq/flush-mode-stat

mon: show # of PGs at high flush mode in the command output

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #5556 from zaitcev/cleanup-dead-code
Yehuda Sadeh [Thu, 20 Aug 2015 16:15:01 +0000 (09:15 -0700)]
Merge pull request #5556 from zaitcev/cleanup-dead-code

rgw: cleanup dead init_bucket

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #5598 from jasuarez/remove-useless-code
Yehuda Sadeh [Thu, 20 Aug 2015 16:13:55 +0000 (09:13 -0700)]
Merge pull request #5598 from jasuarez/remove-useless-code

rgw: Remove useless code in calc_hmac_sha1()

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #5620 from dachary/wip-12734-uuid
Loic Dachary [Thu, 20 Aug 2015 15:49:08 +0000 (17:49 +0200)]
Merge pull request #5620 from dachary/wip-12734-uuid

build/ops: add uuid-runtime to debian/control

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agobuild/ops: add uuid-runtime to debian/control 5620/head
Loic Dachary [Thu, 20 Aug 2015 13:50:30 +0000 (15:50 +0200)]
build/ops: add uuid-runtime to debian/control

uuid-runtime was incorrectly removed by
62bfc7a1ab1587e81ed3bff0ddfbb1aa69d1c299, restore it.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #5621 from ceph/revert-5613-wip-12729
Loic Dachary [Thu, 20 Aug 2015 14:18:01 +0000 (16:18 +0200)]
Merge pull request #5621 from ceph/revert-5613-wip-12729

Revert "Fix compile warning unused-result"

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoRevert "Fix compile warning unused-result" 5621/head
Loic Dachary [Thu, 20 Aug 2015 14:17:13 +0000 (16:17 +0200)]
Revert "Fix compile warning unused-result"

10 years agoMerge pull request #5613 from ceph/wip-12729
Sage Weil [Thu, 20 Aug 2015 13:08:14 +0000 (09:08 -0400)]
Merge pull request #5613 from ceph/wip-12729

Fix compile warning unused-result

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #5523 from ceph/wip-scan-use-layout
Yan, Zheng [Thu, 20 Aug 2015 10:13:02 +0000 (18:13 +0800)]
Merge pull request #5523 from ceph/wip-scan-use-layout

Striped layouts in cephfs-data-scan

10 years agoMerge pull request #5272 from chenji-kael/work-branch
Kefu Chai [Thu, 20 Aug 2015 10:10:03 +0000 (18:10 +0800)]
Merge pull request #5272 from chenji-kael/work-branch

rados.py: wrap omap operation for librados

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #5614 from liewegas/wip-logtomonitors
Yan, Zheng [Thu, 20 Aug 2015 09:47:38 +0000 (17:47 +0800)]
Merge pull request #5614 from liewegas/wip-logtomonitors

mds/MDSRank: less noisy about log_to_monitors

10 years agorbd:remove the local file when rbd export-diff fail 5587/head
caibo [Thu, 20 Aug 2015 09:40:29 +0000 (17:40 +0800)]
rbd:remove the local file when rbd export-diff fail
Signed-off-by: Bo Cai <cai.bo@h3c.com>
10 years agorados.py: This module now supports omap operations 5272/head
chenji [Fri, 17 Jul 2015 03:17:47 +0000 (11:17 +0800)]
rados.py: This module now supports omap operations

you can operate omap in python
test_rados.py: add unit-test cases

Signed-off-by: Ji Chen <insomnia@139.com>
10 years agoMerge pull request #5601 from wonzhq/doc-peering
Kefu Chai [Thu, 20 Aug 2015 03:01:29 +0000 (11:01 +0800)]
Merge pull request #5601 from wonzhq/doc-peering

doc: fix the format of peering.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agomds/MDSRank: less noisy about log_to_monitors 5614/head
Sage Weil [Thu, 20 Aug 2015 02:16:28 +0000 (22:16 -0400)]
mds/MDSRank: less noisy about log_to_monitors

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoFix compile warning unused-result 5613/head
Haomai Wang [Thu, 20 Aug 2015 02:10:21 +0000 (10:10 +0800)]
Fix compile warning unused-result

Fix #12729
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agodoc: fix the format of peering.rst 5601/head
Zhiqiang Wang [Thu, 20 Aug 2015 01:48:07 +0000 (09:48 +0800)]
doc: fix the format of peering.rst

Fix an incorrent number in the ordered list and some indention issue.
Make the ordered list to use '1' or 'a' for the first item, and '#' for
the remaining items.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agoMerge remote-tracking branch 'origin/wip-sam-proxy-write'
Samuel Just [Wed, 19 Aug 2015 22:49:40 +0000 (15:49 -0700)]
Merge remote-tracking branch 'origin/wip-sam-proxy-write'

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Conflicts:
src/include/ceph_features.h
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h

10 years agoosd/PGLog: dirty_to is inclusive 5518/head
Sage Weil [Sun, 9 Aug 2015 14:46:10 +0000 (10:46 -0400)]
osd/PGLog: dirty_to is inclusive

There are only two callers of mark_dirty_to who do not pass max,
and they are both in the merge_log extending tail path.  In that
case, we want to include the last version specified in the log
writeout.  Fix the tail extending code to always specify the
last entry added, inclusive.

Fixes: #12652
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/RocksDBStore: log any options we pass to rocksdb 5611/head
Sage Weil [Wed, 19 Aug 2015 21:03:28 +0000 (17:03 -0400)]
os/RocksDBStore: log any options we pass to rocksdb

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/FileStore: ensure sync() doesn't wait forever
Sage Weil [Wed, 19 Aug 2015 11:04:07 +0000 (07:04 -0400)]
os/FileStore: ensure sync() doesn't wait forever

Avoid

2015-08-19 01:46:37.586450 7f89a53ca980 10 filestore(b.10) start_sync
2015-08-19 01:46:37.586451 7f89a53ca980 10 filestore(b.10) sync waiting
2015-08-19 01:46:37.586528 7f899e2b1700 20 filestore(b.10) sync_entry woke after 5.398564
2015-08-19 01:46:37.586539 7f899e2b1700 20 filestore(b.10) sync_entry waiting for another 35994.601435 to reach min interval 36000.000000

by setting force_sync flag.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agocommon/hobject: rename get_bitreverse_key* -> get_bitwise_key*
Sage Weil [Tue, 18 Aug 2015 22:40:59 +0000 (18:40 -0400)]
common/hobject: rename get_bitreverse_key* -> get_bitwise_key*

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/GenericObjectMap: use bitwise hash, not nibblewise
Sage Weil [Tue, 18 Aug 2015 19:16:45 +0000 (15:16 -0400)]
os/GenericObjectMap: use bitwise hash, not nibblewise

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agocommon/hobject: rename get_filestore_key* -> get_nibblewise_key*
Sage Weil [Tue, 18 Aug 2015 19:13:35 +0000 (15:13 -0400)]
common/hobject: rename get_filestore_key* -> get_nibblewise_key*

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agorbd: fix bench-write
Sage Weil [Tue, 18 Aug 2015 20:05:29 +0000 (16:05 -0400)]
rbd: fix bench-write

Make each IO get a unique offset!

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph-kvstore-tool: take a db type too
Sage Weil [Tue, 18 Aug 2015 18:39:08 +0000 (14:39 -0400)]
ceph-kvstore-tool: take a db type too

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agocommon/hobject: make hobject_t::set_key avoid dups
Sage Weil [Tue, 18 Aug 2015 18:25:38 +0000 (14:25 -0400)]
common/hobject: make hobject_t::set_key avoid dups

If the key matches the oid name, clear it.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agotest_objectstore_memstore.sh on make check
Sage Weil [Tue, 18 Aug 2015 14:52:46 +0000 (10:52 -0400)]
test_objectstore_memstore.sh on make check

This'll give us some coverage from ceph_test_objectstore, albeit
on the memstore backend.  Upside is that this takes < 10s.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph_test_objectstore: test many small writes
Sage Weil [Tue, 28 Apr 2015 16:30:32 +0000 (09:30 -0700)]
ceph_test_objectstore: test many small writes

This exercises the overlay code better.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph_test_objectstore: strengthen clone test w/ new assert
Sage Weil [Tue, 18 Aug 2015 14:11:20 +0000 (10:11 -0400)]
ceph_test_objectstore: strengthen clone test w/ new assert

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph_test_objectstore: test omap clone
Sage Weil [Tue, 18 Aug 2015 14:10:42 +0000 (10:10 -0400)]
ceph_test_objectstore: test omap clone

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph_test_objectstore: much cleanup, new tests
Sage Weil [Tue, 18 Aug 2015 14:10:18 +0000 (10:10 -0400)]
ceph_test_objectstore: much cleanup, new tests

These changes are necessary to make newstore (which is more picky
about unique collection names and objects that land *inside* the
correct collection) pass.  There are also several new tests.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/fs: fix open_handle when name_to_handle not present
Sage Weil [Tue, 28 Apr 2015 23:17:03 +0000 (16:17 -0700)]
os/fs: fix open_handle when name_to_handle not present

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/fs: add zero / hole punch support
Sage Weil [Fri, 10 Apr 2015 23:55:05 +0000 (16:55 -0700)]
os/fs: add zero / hole punch support

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/fs: add simple FS abstraction layer
Sage Weil [Tue, 7 Apr 2015 22:21:50 +0000 (15:21 -0700)]
os/fs: add simple FS abstraction layer

- open by handle
- xfs allocation hint

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/ObjectStore: drop sync(Context *onsync)
Sage Weil [Mon, 17 Aug 2015 19:23:14 +0000 (15:23 -0400)]
os/ObjectStore: drop sync(Context *onsync)

No users.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/ObjectStore: drop sync()
Sage Weil [Mon, 17 Aug 2015 19:22:57 +0000 (15:22 -0400)]
os/ObjectStore: drop sync()

No callers.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/ObjectStore: drop flush()
Sage Weil [Mon, 17 Aug 2015 19:22:35 +0000 (15:22 -0400)]
os/ObjectStore: drop flush()

No more callers.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/ObjectStore: drop sync_and_flush()
Sage Weil [Mon, 17 Aug 2015 19:22:13 +0000 (15:22 -0400)]
os/ObjectStore: drop sync_and_flush()

The semantics of this call were FileStore-specific; and there are no more
callers.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: improve osd bench
Sage Weil [Tue, 28 Jul 2015 17:22:27 +0000 (13:22 -0400)]
osd: improve osd bench

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agobuffer: add prepare_iov() method
Sage Weil [Thu, 16 Apr 2015 00:01:59 +0000 (17:01 -0700)]
buffer: add prepare_iov() method

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: drop dead suicide() code
Sage Weil [Sat, 11 Apr 2015 00:13:09 +0000 (17:13 -0700)]
osd: drop dead suicide() code

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph-objectstore-tool: drop explicit sync_and_flush() calls
Sage Weil [Sat, 11 Apr 2015 00:39:31 +0000 (17:39 -0700)]
ceph-objectstore-tool: drop explicit sync_and_flush() calls

We implicitly sync on shutdown.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph_test_objectstore: drop useless sync_and_flush
Sage Weil [Mon, 17 Aug 2015 19:15:24 +0000 (15:15 -0400)]
ceph_test_objectstore: drop useless sync_and_flush

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: sync (no flush) on osd suicide
Sage Weil [Sat, 11 Apr 2015 00:07:58 +0000 (17:07 -0700)]
osd: sync (no flush) on osd suicide

Not that we even need to sync here!

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: drop explicit sync/flush calls before umount
Sage Weil [Sat, 11 Apr 2015 00:07:34 +0000 (17:07 -0700)]
osd: drop explicit sync/flush calls before umount

Do it implicity on umount.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: fix flush_journal command
Sage Weil [Sat, 11 Apr 2015 00:06:26 +0000 (17:06 -0700)]
osd: fix flush_journal command

We need to sync_and_flush *and* sync() again in order to retire any items
in the FileStore journal.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: explicitly use a 'meta' Sequencer
Sage Weil [Mon, 6 Apr 2015 20:55:46 +0000 (13:55 -0700)]
osd: explicitly use a 'meta' Sequencer

Use an explicit Sequencer for all transactions.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: use osr for scan_snaps
Sage Weil [Mon, 6 Apr 2015 20:54:46 +0000 (13:54 -0700)]
osd: use osr for scan_snaps

Updates should be ordered with respect to PG metadata.  Not that it matters
that much since we are doing cleanup/repair work here.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/ObjectStore: do not let Sequencer::flush_commit delete the context
Sage Weil [Mon, 17 Aug 2015 19:09:47 +0000 (15:09 -0400)]
os/ObjectStore: do not let Sequencer::flush_commit delete the context

Let the caller manage the lifecycle; this allows us to potentially put it
on the stack, for instance.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/ObjectStore: ref count Sequencer_impl
Sage Weil [Mon, 17 Aug 2015 19:09:29 +0000 (15:09 -0400)]
os/ObjectStore: ref count Sequencer_impl

This allows the implementation to have a lifecycle that extends beyond
the Sequencer interface object we expose to the user.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/KeyValueDB: return -ENOENT if key doesn't exist
Xiaoxi Chen [Wed, 8 Apr 2015 13:43:29 +0000 (21:43 +0800)]
os/KeyValueDB: return -ENOENT if key doesn't exist

Previous code return 0 in all cases, caller doesn't
know if the key is exists in the db.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
10 years agoos/ObjectStore: pass bits to create_collection
Sage Weil [Wed, 1 Apr 2015 00:32:36 +0000 (17:32 -0700)]
os/ObjectStore: pass bits to create_collection

This informs the backend how many bits of the hash range will be covered
by the collection.  Those bits are implicitly matched against the spg_t in
coll_t.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/osd_types: pg_t: add contains() helper to check objects is in a pg
Sage Weil [Wed, 1 Apr 2015 00:24:35 +0000 (17:24 -0700)]
osd/osd_types: pg_t: add contains() helper to check objects is in a pg

This calls the ghobject_t method that does the same, along with ps().

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/ObjectStore: return const refs for oid, cid
Sage Weil [Wed, 1 Apr 2015 00:05:30 +0000 (17:05 -0700)]
os/ObjectStore: return const refs for oid, cid

Should be a bit faster.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agocommon/WorkQueue: add wait()
Sage Weil [Wed, 1 Apr 2015 00:04:07 +0000 (17:04 -0700)]
common/WorkQueue: add wait()

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agovstart.sh: allow rocksdb
Sage Weil [Tue, 31 Mar 2015 00:54:13 +0000 (17:54 -0700)]
vstart.sh: allow rocksdb

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/RocksDbStore: init pointers in ctor
Sage Weil [Sat, 15 Aug 2015 19:30:27 +0000 (15:30 -0400)]
os/RocksDbStore: init pointers in ctor

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/osd_types: make coll_t operator== less picky
Sage Weil [Sat, 28 Mar 2015 00:06:44 +0000 (17:06 -0700)]
osd/osd_types: make coll_t operator== less picky

For meta coll's do not compare pg.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/KeyValueDB: add sipler get() variant
Sage Weil [Tue, 17 Feb 2015 19:29:35 +0000 (11:29 -0800)]
os/KeyValueDB: add sipler get() variant

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agocommon/Formatter: add dump_object helper
Sage Weil [Mon, 9 Feb 2015 08:56:50 +0000 (00:56 -0800)]
common/Formatter: add dump_object helper

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/FileStore: clear cached fd for renamed-over object
Sage Weil [Tue, 31 Mar 2015 22:31:02 +0000 (15:31 -0700)]
os/FileStore: clear cached fd for renamed-over object

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #5470 from ceph/wip-newstore-sort
Sage Weil [Wed, 19 Aug 2015 15:07:14 +0000 (11:07 -0400)]
Merge pull request #5470 from ceph/wip-newstore-sort

osd: change sort order for hobject_t

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #5424 from lebauce/fix_swift_user_command_line
Sage Weil [Wed, 19 Aug 2015 13:21:42 +0000 (09:21 -0400)]
Merge pull request #5424 from lebauce/fix_swift_user_command_line

doc: fix command line for swift user creation

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #5048 from SUSE/wip-objecter-comment-cleanup
Sage Weil [Wed, 19 Aug 2015 13:21:15 +0000 (09:21 -0400)]
Merge pull request #5048 from SUSE/wip-objecter-comment-cleanup

Objecter.cc: fix name of _take_op_budget() function in comment

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #5606 from liewegas/wip-scrub-errormsg
Kefu Chai [Wed, 19 Aug 2015 11:55:53 +0000 (19:55 +0800)]
Merge pull request #5606 from liewegas/wip-scrub-errormsg

osd/ReplicatedPG: fix missing whitespace in scrub error message

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #5604 from oritwas/wip-cmake-fix-rbd
Kefu Chai [Wed, 19 Aug 2015 10:48:32 +0000 (18:48 +0800)]
Merge pull request #5604 from oritwas/wip-cmake-fix-rbd

cmake: add DiffIterate.cc to librbd

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agomoved to use boost uuid implementation, based on commit 4fe89a7b14c97b2ed7f357132901b...
Rohan Mars [Thu, 13 Aug 2015 04:19:31 +0000 (21:19 -0700)]
moved to use boost uuid implementation, based on commit 4fe89a7b14c97b2ed7f357132901beb2bdcec551

Signed-off-by: Rohan Mars <code@rohanmars.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
10 years agoMerge pull request #5433 from zqkkqz/master
Sage Weil [Wed, 19 Aug 2015 10:44:20 +0000 (06:44 -0400)]
Merge pull request #5433 from zqkkqz/master

common/Thread: pthread_attr_destroy(thread_attr) when done with it

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoosd/ReplicatedPG: fix missing whitespace in scrub error message 5606/head
Sage Weil [Wed, 19 Aug 2015 10:40:17 +0000 (06:40 -0400)]
osd/ReplicatedPG: fix missing whitespace in scrub error message

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #5538 from ceph/wip-selinux-improve-update
Sage Weil [Wed, 19 Aug 2015 10:29:40 +0000 (06:29 -0400)]
Merge pull request #5538 from ceph/wip-selinux-improve-update

selinux: Relabel files if and only if the policy version changed

Reviewed-by: Milan Broz <mbroz@redhat.com>
10 years agoceph.spec.in: Require awk for selinux post script 5538/head
Boris Ranto [Wed, 19 Aug 2015 09:25:52 +0000 (11:25 +0200)]
ceph.spec.in: Require awk for selinux post script

Signed-off-by: Boris Ranto <branto@redhat.com>
10 years agoselinux: Relabel files if and only if the policy version changed
Boris Ranto [Tue, 11 Aug 2015 07:13:01 +0000 (09:13 +0200)]
selinux: Relabel files if and only if the policy version changed

Currently, the ceph files are being relabelled every time the package is
rebuilt. Fix this by checking the policy versions and relabel the files
only if the policy actually changed (different policy version was
detected).

Signed-off-by: Boris Ranto <branto@redhat.com>
10 years agoMerge pull request #5596 from mbroz/wip-selinux-systemd
branto1 [Wed, 19 Aug 2015 09:00:40 +0000 (11:00 +0200)]
Merge pull request #5596 from mbroz/wip-selinux-systemd

Update ceph-selinux rpm spec

Reviewed-by: Boris Ranto <branto@redhat.com>
10 years agocmake: add DiffIterate.cc to librbd 5604/head
Orit Wasserman [Wed, 19 Aug 2015 08:56:27 +0000 (10:56 +0200)]
cmake: add DiffIterate.cc to librbd

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
10 years agoMerge pull request #5600 from liewegas/wip-osd-bind
Loic Dachary [Tue, 18 Aug 2015 19:19:37 +0000 (21:19 +0200)]
Merge pull request #5600 from liewegas/wip-osd-bind

doc: ceph-osd binds to up to 4 ports, not 3

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoReplicatedPG::cancel_pull: also finish_degraded_object 5599/head
Samuel Just [Mon, 17 Aug 2015 18:21:49 +0000 (11:21 -0700)]
ReplicatedPG::cancel_pull: also finish_degraded_object

We might have degraded object waiters on a pull.

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoReplicatedPG: treat object as degraded until on_global_recover
Samuel Just [Mon, 17 Aug 2015 18:21:27 +0000 (11:21 -0700)]
ReplicatedPG: treat object as degraded until on_global_recover

Otherwise, an op might slip by between on_local_recover and
on_global_recover.

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoReplicatedPG: block writes on promote of rollback snap promotion
Samuel Just [Mon, 27 Jul 2015 20:19:18 +0000 (13:19 -0700)]
ReplicatedPG: block writes on promote of rollback snap promotion

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoReplicatedPG: enforce write ordering on rollback
Samuel Just [Mon, 27 Jul 2015 20:12:25 +0000 (13:12 -0700)]
ReplicatedPG: enforce write ordering on rollback

Previously, rollback ops could reorder w.r.t other writes due to waiting
on degraded snaps other than head.  To fix that, we'll introduce a new
map tracking objects blocked on degraded snaps.  A particular object can
only be blocked on one snap at a time (subsequent writes won't get far
enough to add another entry).

It might have been possible use the blocked_by machinery for this, but
it requires that the object have an extant obc, which we may not
have for a missing object.  Also, that machinery exists primarily to
support clone_range, which I hope to remove soon.

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoRadosModel: send writes before and after rollback to verify ordering
Samuel Just [Thu, 23 Jul 2015 23:49:01 +0000 (16:49 -0700)]
RadosModel: send writes before and after rollback to verify ordering

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoRevert "osd: set the blocked_by relationship when rolling back to a degraded"
Samuel Just [Thu, 23 Jul 2015 22:31:23 +0000 (15:31 -0700)]
Revert "osd: set the blocked_by relationship when rolling back to a degraded"

This reverts commit 48dacd75566f64cb89f991ac4d05e2e50c4e73e0.