]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Sage Weil [Fri, 28 Feb 2014 16:06:03 +0000 (08:06 -0800)]
mon/OSDMonitor: make default false-positive-probability 5%
This is a more conservative default (as in, less memory consumed) for
newly created cache pools.
Signed-off-by: Sage Weil <sage@inktank.com>
Yan, Zheng [Wed, 26 Feb 2014 02:17:34 +0000 (10:17 +0800)]
mds: fix nested_anchors update during journal replay
check if the inode is anchored/unanchored before updating the inode
Fixes: #7530
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
Gregory Farnum [Wed, 26 Feb 2014 15:12:04 +0000 (07:12 -0800)]
Merge pull request #1319 from ceph/wip-primary-temp-fix
osd/OSDMap: respect temp primary without temp acting
Reviewed-by: Greg Farnum <greg@inktank.com>
Samuel Just [Wed, 26 Feb 2014 06:48:18 +0000 (22:48 -0800)]
osd/OSDMap: respect temp primary without temp acting
be2748c6d540891f2e1a62e7034cb44f7d04bf18 ensured that
if the temp acting mapping contains only CRUSH_ITEM_NONE,
that the acting_primary is left at -1. However, even if
acting.empty(), we need to respect a temp_primary mapping.
Thus, use _acting_primary unless acting.empty() &&
acting_primary == -1.
Bug introduced in
be2748c6d540891f2e1a62e7034cb44f7d04bf18 .
Signed-off-by: Samuel Just <sam.just@inktank.com>
Samuel Just [Wed, 26 Feb 2014 04:42:18 +0000 (20:42 -0800)]
Merge pull request #1317 from ceph/wip-7537
Wip 7537
Reviewed-by: David Zafman <david.zafman@inktank.com>
Samuel Just [Wed, 26 Feb 2014 00:47:21 +0000 (16:47 -0800)]
OSDMap::_pg_to_up_acting_osds: use _acting_primary unless acting is empty
If the temp set for whatever reason has only CRUSH_ITEM_NONE,
we need primary to be -1.
Signed-off-by: Samuel Just <sam.just@inktank.com>
Samuel Just [Tue, 25 Feb 2014 23:28:08 +0000 (15:28 -0800)]
Merge pull request #1311 from ceph/wip-dz-scrub-fixes
Wip dz scrub fixes
Reviewed-by: Samuel Just <sam.just@inktank.com>
Samuel Just [Tue, 25 Feb 2014 20:34:57 +0000 (12:34 -0800)]
OSDMonitor: when thrashing, only generate valid temp pg mappings
Since backfill peers are no longer placed into the acting set,
temp mappings will never exceed the pool size. Also, for ec
pools, temp mappings will never be less than the pool size.
Signed-off-by: Samuel Just <sam.just@inktank.com>
David Zafman [Tue, 25 Feb 2014 03:56:48 +0000 (19:56 -0800)]
Revert "osd/PG: fix assert when deep repair finds no errors"
This reverts commit
e3e3328ec8a57f1ae2a2fd9893c51068798720a0 .
David Zafman [Tue, 25 Feb 2014 00:49:28 +0000 (16:49 -0800)]
osd: Don't include primary's shard in repair result message
Signed-off-by: David Zafman <david.zafman@inktank.com>
Gregory Farnum [Mon, 24 Feb 2014 17:17:42 +0000 (09:17 -0800)]
Merge pull request #1308 from ceph/wip-osdmap-inc
mon/OSDMonitor: fix osdmap encode feature logic
Reviewed-by: Greg Farnum <greg@inktank.com>
Gregory Farnum [Mon, 24 Feb 2014 17:08:36 +0000 (09:08 -0800)]
Merge pull request #1302 from ceph/wip-create-null
client: fix possible null dereference in create
Reviewed-by: Greg Farnum <greg@inktank.com>
Sage Weil [Mon, 24 Feb 2014 03:54:14 +0000 (19:54 -0800)]
ceph_test_objectstore: fix i386 build (again)
test/objectstore/store_test.cc: In member function ‘void SyntheticWorkloadState::read()’:
error: test/objectstore/store_test.cc:462:23: no matching function for call to ‘swap(uint64_t&, size_t&)’
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Mon, 24 Feb 2014 03:49:18 +0000 (19:49 -0800)]
Merge pull request #1307 from ceph/wip-7517
Wip 7517
Sage Weil [Mon, 24 Feb 2014 02:23:55 +0000 (18:23 -0800)]
mon/OSDMonitor: fix osdmap encode feature logic
If we are encoding a full map based on an old Incremental that does not
encode the features, fall back to the quorum features or (barring that)
all features. Do *not* do no features or else we will end up with
encode_client_old which does not even include the extended info and will
cause the mon to crash when decoding.
This was observed when upgading a 0.76 cluster to 0.77 (all mons stopped,
upgraded, and then started)
Reported-by: Aaron Ten Clay <aarontc@aarontc.com>
Signed-off-by: Sage Weil <sage@inktank.com>
Samuel Just [Mon, 24 Feb 2014 00:02:43 +0000 (16:02 -0800)]
PG: skip pg_whoami.osd, not pg_whoami.shard in scrub feature check
Caused by typo in
68184d4574cd507ab3a065693e392917b98e16ec .
Fixes: #7517
Signed-off-by: Samuel Just <sam.just@inktank.com>
Samuel Just [Sun, 23 Feb 2014 23:32:18 +0000 (15:32 -0800)]
Merge pull request #1304 from ceph/wip-last-epoch-clean
mon: fix min_last_epoch_clean handling
Reviewed-by: Samuel Just <sam.just@inktank.com>
Sage Weil [Sun, 23 Feb 2014 22:48:10 +0000 (14:48 -0800)]
Merge pull request #1306 from ceph/wip-7512
wip-7512
Reviewed-by: Sage Weil <sage@inktank.com>
Samuel Just [Sat, 22 Feb 2014 20:30:29 +0000 (12:30 -0800)]
OSD::project_pg_history needs to account for acting_primary/up_primary
Fixes: #7512
Signed-off-by: Samuel Just <sam.just@inktank.com>
Samuel Just [Sun, 23 Feb 2014 21:23:42 +0000 (13:23 -0800)]
Objecter/OSDMap: factor out primary_changed() into static OSDMap method
We need to reuse this logic in OSD::project_pg_history.
Signed-off-by: Samuel Just <sam.just@inktank.com>
Samuel Just [Sun, 23 Feb 2014 21:29:07 +0000 (13:29 -0800)]
PG: clarify same_primary_since updates regarding primary rank
pg_shard_t includes the position, so these checks handle
same osd/different rank properly.
Signed-off-by: Samuel Just <sam.just@inktank.com>
Sage Weil [Sat, 22 Feb 2014 17:29:15 +0000 (09:29 -0800)]
mon/PGMap: fix osd_epochs update
The insert() call here does not overwrite a previous entry, which means
that the osd_epochs map is never moving forward in time. This seems to
have been broken since it was introduced in
091809b814 .
Backport: emperor, dumpling
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Sat, 22 Feb 2014 17:17:44 +0000 (09:17 -0800)]
mon/PGMap: add unit test for min_last_epoch_clean
Signed-off-by: Sage Weil <sage@inktank.com>
Samuel Just [Sun, 23 Feb 2014 08:48:27 +0000 (00:48 -0800)]
ECBackend: skip canceled xattr reads as well
Signed-off-by: Samuel Just <sam.just@inktank.com>
Sage Weil [Sun, 23 Feb 2014 18:18:02 +0000 (10:18 -0800)]
client: fix possible null dereference in create
There are two paths that jump to the out label for which 'in' can be
NULL and outp can be non-NULL. For those cases we want to fill in the
caller's pointer value (they asked for it) but we clearly cannot take
a reference.
Backport: emperor, dumpling
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Sun, 23 Feb 2014 18:05:39 +0000 (10:05 -0800)]
osd: increase default leveldb write buffer, cache size
The FileStore's leveldb currently uses libleveldb's defaults for cache and
write buffer size, which are both 4 MB. Increase the cache size to 128MB and
the write buffer to 8MB.
Tested-by: Dmitry Smirnov <onlyjob@member.fsf.org>
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Sun, 23 Feb 2014 17:05:56 +0000 (09:05 -0800)]
ceph_test_objectstore: fix i386 build error
We can't swap size_t and uint64_t; just change the len type to match.
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Sun, 23 Feb 2014 17:03:42 +0000 (09:03 -0800)]
ceph_test_objectstore: fix signed/unsigned warning
In file included from test/objectstore/store_test.cc:33:0:
../src/gtest/include/gtest/gtest.h: In function ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = int, T2 = unsigned int]’:
../src/gtest/include/gtest/gtest.h:1300:30: instantiated from ‘static testing::AssertionResult testing::internal::EqHelper::Compare(const char*, const char*, const T1&, const T2&) [with T1 = int, T2 = unsigned int, bool lhs_is_null_literal = false]’
test/objectstore/store_test.cc:484:193: instantiated 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>
Loic Dachary [Wed, 19 Feb 2014 14:05:50 +0000 (15:05 +0100)]
erasure-code: test that changing the pool size is not allowed
http://tracker.ceph.com/issues/7360 fixes #7360
Signed-off-by: Loic Dachary <loic@dachary.org>
Sage Weil [Sun, 23 Feb 2014 15:25:13 +0000 (07:25 -0800)]
Merge pull request #1294 from ceph/wip-librados-object-iterator
fix bugs in librados::ObjectIterator
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Sun, 23 Feb 2014 15:24:43 +0000 (07:24 -0800)]
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>
Sage Weil [Sun, 23 Feb 2014 15:12:40 +0000 (07:12 -0800)]
Merge pull request #1297 from ceph/wip-ec-bugs
Wip ec bugs
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Sun, 23 Feb 2014 06:00:55 +0000 (22:00 -0800)]
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>
Sage Weil [Sun, 23 Feb 2014 05:56:53 +0000 (21:56 -0800)]
Merge pull request #1301 from ceph/wip-scrub-primary
mon/PGMonitor: fix primary osd check on deep-scrub
gitbuilders are now passing
Sage Weil [Sun, 23 Feb 2014 05:31:48 +0000 (21:31 -0800)]
mon/PGMonitor: fix primary osd check on deep-scrub
s/!=/==/. Logic was reversed.
Broken in
40bdcb88504aea6288d461d29d24d5b0bf7aeebc .
Signed-off-by: Sage Weil <sage@inktank.com>
Samuel Just [Sun, 23 Feb 2014 01:35:46 +0000 (17:35 -0800)]
Merge pull request #1300 from ceph/wip-7513
PGLog::activate_not_complete typo
Reviewed-by: David Zafman <david.zafman@inktank.com>
Samuel Just [Sun, 23 Feb 2014 00:38:46 +0000 (16:38 -0800)]
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>
Samuel Just [Sun, 23 Feb 2014 01:18:55 +0000 (17:18 -0800)]
Merge pull request #1298 from ceph/wip-subscribe
osd: fix off-by-one is boot subscription
Reviewed-by: Samuel Just <sam.just@inktank.com>
David Zafman [Sat, 22 Feb 2014 22:55:08 +0000 (14:55 -0800)]
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>
David Zafman [Sat, 22 Feb 2014 21:51:03 +0000 (13:51 -0800)]
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>
Samuel Just [Fri, 21 Feb 2014 21:25:36 +0000 (13:25 -0800)]
PGLog: test for missing using the correct shard value
Signed-off-by: Samuel Just <sam.just@inktank.com>
Samuel Just [Fri, 21 Feb 2014 21:25:17 +0000 (13:25 -0800)]
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>
Samuel Just [Fri, 21 Feb 2014 20:00:06 +0000 (12:00 -0800)]
Objecter: make is_pg_changed static and const for old/newacting
Signed-off-by: Samuel Just <sam.just@inktank.com>
Samuel Just [Fri, 21 Feb 2014 19:59:16 +0000 (11:59 -0800)]
OSDMap: make calc_pg_rank/role const for acting
Signed-off-by: Samuel Just <sam.just@inktank.com>
Samuel Just [Fri, 21 Feb 2014 19:59:04 +0000 (11:59 -0800)]
Objecter: resend op if primary role changed
Fixes: #7508
Signed-off-by: Samuel Just <sam.just@inktank.com>
Samuel Just [Fri, 21 Feb 2014 17:34:15 +0000 (09:34 -0800)]
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>
Samuel Just [Fri, 21 Feb 2014 17:33:05 +0000 (09:33 -0800)]
ECUtil: clear() should reset hashes to -1, not 0
Signed-off-by: Samuel Just <sam.just@inktank.com>
Samuel Just [Fri, 21 Feb 2014 02:32:08 +0000 (18:32 -0800)]
ReplicatedPG::cancel_pull: ECBackend might cancel_pull on a non-missing object
Signed-off-by: Samuel Just <sam.just@inktank.com>
Samuel Just [Fri, 21 Feb 2014 02:31:35 +0000 (18:31 -0800)]
ECBackend::filter_read_op: clean up read state properly
Fixes: #7494
Signed-off-by: Samuel Just <sam.just@inktank.com>
Sage Weil [Sat, 22 Feb 2014 16:08:37 +0000 (08:08 -0800)]
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>
Haomai Wang [Sat, 22 Feb 2014 15:57:02 +0000 (23:57 +0800)]
Rename keyvaluestore_check_backend to keyvaluestore_debug_check_backend
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 21 Feb 2014 14:48:00 +0000 (22:48 +0800)]
Add KeyValueStore op thread options
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 21 Feb 2014 14:44:39 +0000 (22:44 +0800)]
Remove eio inject codes in KeyValueStore
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 21 Feb 2014 14:35:10 +0000 (22:35 +0800)]
Add config tracker to KeyValueStore
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 21 Feb 2014 14:33:58 +0000 (22:33 +0800)]
Add backend check option to KeyValueStore
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 21 Feb 2014 14:14:52 +0000 (22:14 +0800)]
Remove filestore_inject_stall
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 21 Feb 2014 14:10:17 +0000 (22:10 +0800)]
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>
Haomai Wang [Fri, 21 Feb 2014 13:59:42 +0000 (21:59 +0800)]
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>
Haomai Wang [Fri, 21 Feb 2014 13:36:48 +0000 (21:36 +0800)]
Implement collection_rename interface in KeyValueStore
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Fri, 21 Feb 2014 12:55:19 +0000 (20:55 +0800)]
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>
Haomai Wang [Fri, 21 Feb 2014 08:46:53 +0000 (16:46 +0800)]
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>
Haomai Wang [Fri, 21 Feb 2014 06:44:48 +0000 (14:44 +0800)]
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>
Haomai Wang [Fri, 21 Feb 2014 04:23:10 +0000 (12:23 +0800)]
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>
Haomai Wang [Fri, 21 Feb 2014 04:22:24 +0000 (12:22 +0800)]
Return 0 when the offset of read exceed the length of object
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Thu, 20 Feb 2014 08:57:34 +0000 (16:57 +0800)]
Add read/write operation to store_test.cc
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Thu, 20 Feb 2014 06:21:54 +0000 (14:21 +0800)]
Adjust some interfaces to optimize caller codes
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Thu, 20 Feb 2014 04:20:21 +0000 (12:20 +0800)]
Use rename operation to make colection_move atomic
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Thu, 20 Feb 2014 03:43:16 +0000 (11:43 +0800)]
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>
Haomai Wang [Thu, 20 Feb 2014 03:42:55 +0000 (11:42 +0800)]
Add test for omap interface
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Haomai Wang [Tue, 18 Feb 2014 14:46:22 +0000 (22:46 +0800)]
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>
Haomai Wang [Tue, 18 Feb 2014 07:04:25 +0000 (15:04 +0800)]
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>
David Zafman [Sat, 22 Feb 2014 03:28:37 +0000 (19:28 -0800)]
Merge branch 'wip-6685-firefly' into firefly
Reviewed-by: Samuel Just <sam.just@inktank.com>
Josh Durgin [Sat, 22 Feb 2014 02:30:29 +0000 (18:30 -0800)]
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>
Christopher O'Connell [Sat, 22 Feb 2014 02:26:58 +0000 (18:26 -0800)]
Added a note that the ceph-osd command requires the cluster option.
Signed-off-by: Christopher O'Connell <jwriteclub@gmail.com>
Josh Durgin [Fri, 21 Feb 2014 01:28:11 +0000 (17:28 -0800)]
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>
Josh Durgin [Sat, 22 Feb 2014 01:40:30 +0000 (17:40 -0800)]
Merge remote-tracking branch 'origin/wip-da-SCA-
20140218 ' into firefly
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Christopher O'Connell [Sat, 22 Feb 2014 02:23:38 +0000 (18:23 -0800)]
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>
Josh Durgin [Fri, 21 Feb 2014 23:52:59 +0000 (15:52 -0800)]
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>
Josh Durgin [Fri, 21 Feb 2014 01:30:54 +0000 (17:30 -0800)]
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>
Josh Durgin [Fri, 21 Feb 2014 23:57:29 +0000 (15:57 -0800)]
Merge pull request #1286 from ceph/wip-corpus
ceph-object-corpus: prune some old releases
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
David Zafman [Mon, 17 Feb 2014 02:24:33 +0000 (18:24 -0800)]
Revert "ReplicatedPG::recover_backfill: adjust last_backfill to HEAD if snapdir"
This reverts commit
545135f3e1c75318940caa2c82ac32a53fc4f957 .
Conflicts:
src/osd/ReplicatedPG.cc
Josh Durgin [Fri, 21 Feb 2014 22:46:27 +0000 (14:46 -0800)]
Merge remote-tracking branch 'origin/port/updates' into firefly
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Sage Weil [Fri, 21 Feb 2014 21:57:24 +0000 (13:57 -0800)]
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>
Josh Durgin [Fri, 21 Feb 2014 21:10:47 +0000 (13:10 -0800)]
Merge remote-tracking branch 'origin/wip-6936' into firefly
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Josh Durgin [Fri, 21 Feb 2014 21:09:52 +0000 (13:09 -0800)]
Merge remote-tracking branch 'origin/wip-7099' into firefly
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Josh Durgin [Fri, 21 Feb 2014 21:08:21 +0000 (13:08 -0800)]
Merge remote-tracking branch 'origin/wip-6830' into firefly
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Josh Durgin [Fri, 21 Feb 2014 21:07:34 +0000 (13:07 -0800)]
Merge remote-tracking branch 'origin/wip-6951' into firefly
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Josh Durgin [Fri, 21 Feb 2014 21:06:37 +0000 (13:06 -0800)]
Merge remote-tracking branch 'origin/wip-7064' into firefly
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Josh Durgin [Fri, 21 Feb 2014 21:05:49 +0000 (13:05 -0800)]
Merge remote-tracking branch 'origin/wip-7271' into firefly
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Noah Watkins [Fri, 21 Feb 2014 21:00:29 +0000 (13:00 -0800)]
dencoder: check for radosgw build option
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Fri, 21 Feb 2014 21:00:09 +0000 (13:00 -0800)]
osd: use ceph scoped shared_ptr
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Samuel Just [Fri, 21 Feb 2014 01:04:14 +0000 (17:04 -0800)]
Merge remote-tracking branch 'upstream/next'
Samuel Just [Fri, 21 Feb 2014 01:02:17 +0000 (17:02 -0800)]
Merge remote-tracking branch 'upstream/wip-copyget' into next
Fixes: #7471
Reviewed-by: Greg Farnum <greg@inktank.com>
Samuel Just [Fri, 21 Feb 2014 00:00:52 +0000 (16:00 -0800)]
PG::build_might_have_unfound: skip CRUSH_ITEM_NONE
Signed-off-by: Samuel Just <sam.just@inktank.com>
Samuel Just [Thu, 20 Feb 2014 23:01:07 +0000 (15:01 -0800)]
ECBackend: deal with temp collection details in handle_sub_write
Signed-off-by: Samuel Just <sam.just@inktank.com>
Samuel Just [Thu, 20 Feb 2014 21:15:51 +0000 (13:15 -0800)]
ReplicatedPG::on_global_recover: requeue degraded, then unreadable
We need to requeue in reverse order since we are requeueing at the
front.
Signed-off-by: Samuel Just <sam.just@inktank.com>
Yehuda Sadeh [Thu, 20 Feb 2014 17:01:21 +0000 (09:01 -0800)]
rgw: minor cleanup
Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Mouad Benchchaoui [Thu, 20 Feb 2014 16:06:33 +0000 (17:06 +0100)]
Fix generate keystone token from credentials
Request to v2.0/tokens must be a POST request and the request
should specify JSON in the content-type header and fix request
body JSON generation to have the right JSON format.
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Signed-off-by: Mouad Benchchaoui <m.benchchaoui@x-ion.de>
Ken Dreyer [Thu, 20 Feb 2014 03:05:51 +0000 (03:05 +0000)]
Merge branch 'next'
Conflicts:
src/test/admin_socket.cc
Signed-off-by: Ken Dreyer <ken.dreyer@inktank.com>
Samuel Just [Thu, 20 Feb 2014 02:41:19 +0000 (18:41 -0800)]
RadosModel: copyfrom should result in a dirty object
Signed-off-by: Samuel Just <sam.just@inktank.com>