Commit Graph

24750 Commits

Author SHA1 Message Date
Sage Weil
29642d33c3 Merge remote-tracking branch 'gh/wip-4147' 2013-02-25 16:49:37 -08:00
John Wilkins
9e6025b697 doc: Added subnet example and verbiage to network settings.
fixes: #4049

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-25 16:29:57 -08:00
John Wilkins
5e5530be19 doc: Added content to remove REJECT rules from iptables.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-25 16:12:50 -08:00
Josh Durgin
9c693d7e83 test_rbd: move flatten tests back into TestClone
They need the same setup, and it's easy enough to run specific
subtests. Making them a separate subclass accidentally duplicated
tests from TestClone.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-02-25 16:09:29 -08:00
Josh Durgin
55bd7687bf qa: enable watch-notify dependent test
This works now that watch-notify has been reworked a bit.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-02-25 15:59:48 -08:00
Josh Durgin
345aa2df54 test_rbd: close image before removing it
This error was masked before by watch notify not differentiating
between watches from the same client with different cookies.
Reopen the image at the end of this test so teardown works.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-02-25 15:56:00 -08:00
John Wilkins
9ab0fd758a doc: Added a small ref section for osd config reference.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-25 15:28:07 -08:00
John Wilkins
3ef6d5bde1 doc: Updated osd configuration reference.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-25 15:27:09 -08:00
Josh Durgin
5b24a68b6e systest: restrict list error acceptance
Only ignore errors after the midway point if the midway_sem_post is
defined.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-02-25 15:02:56 -08:00
Josh Durgin
b0271e3905 systest: fix race with pool deletion
The second test have pool deletion and object listing wait on the same
semaphore to connect and start. This led to errors sometimes when the
pool was deleted before it could be opened by the listing process. Add
another semaphore so the pool deletion happens only after the listing
has begun.

Fixes: #4147
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-02-25 14:55:37 -08:00
Josh Durgin
2b7deeea2e qa: output rados test names as they run
So we don't have to figure out which test is running from the output,
which can be difficult with the system tests.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-02-25 14:09:44 -08:00
Samuel Just
62999ea2d3 PG,ReplicatedPG: use pg_has_reset_since to discard old async events
Local async events are obsolete if the pg is deleting or if the
epoch at which they were created is prior to last_peering_reset.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-02-25 13:30:11 -08:00
Samuel Just
67225339dc PG::build_scrub_map: detect race with peering via last_peering_reset
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-02-25 13:30:11 -08:00
Samuel Just
04ee8f478b ReplicatedPG::C_OSD_CommittedPushedObject: use intrusive_ptr for pg
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-02-25 13:30:11 -08:00
Samuel Just
a01dea6af9 ReplicatedPG::C_OSD_CommittedPushedObject take epoch submitted
What we really care about is that the epoch in which the Context
was submitted is at complete() time >= last_peering_reset.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-02-25 13:30:11 -08:00
Josh Durgin
c4537347b3 librbd: remove unused internal method
get_snap_size() has been replaced by get_image_size(snap_id) everywhere.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-02-25 12:12:57 -08:00
Josh Durgin
db5fc2270f Merge branch 'wip-4249' into wip-4249-master
Make snap_rollback() only take a read lock on snap_lock, since
it does not modify snapshot-related fields.
Conflicts:
	src/librbd/internal.cc
2013-02-25 12:12:04 -08:00
Josh Durgin
5806226cf0 librbd: drop snap_lock before invalidating cache
Writeback will take the snap_lock, so read everything we need under it
before invalidating the cache. This avoids a recursive lock when writeback
uses snap_lock while snap_rollback() was holding it.

Remove a not-very-useful debugging message that depended on snap_lock being held.

Fixes: #4249
Backport: bobtail
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-02-25 11:36:58 -08:00
Sage Weil
7f61072ad6 Merge pull request #71 from dalgaaf/wip-da-sca-c_str
fix some c_str() usage

Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-25 09:10:49 -08:00
Sage Weil
35ce9d6374 Merge pull request #72 from dalgaaf/wip-da-comp-sign-unsign
Monitor.cc: fix -Wsign-

Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-25 08:53:22 -08:00
Sage Weil
d1724bfe00 Merge pull request #70 from dalgaaf/wip-da-fix-spec
Add missing files to spec and debian files

Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-25 08:52:26 -08:00
John Wilkins
3fdf439349 doc: Moved admonition to kernel mount.
fixes: #4146

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-25 08:21:11 -08:00
John Wilkins
516935bc23 doc: Added verbiage to describe single host deadlocks.
fixes: #3076

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-25 08:19:58 -08:00
Danny Al-Gaaf
67103a885b Monitor.cc: fix -Wsign-compare
Fix -Wsign-compare, make 'i' unsigned int.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-25 16:38:50 +01:00
Danny Al-Gaaf
cf167a1f30 debian: add new files
Add new (installed) files to debian install files.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-25 15:36:37 +01:00
Danny Al-Gaaf
4b77deb477 ceph.spec.in: add new files
Add new files to spec file since they get installed.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-25 15:34:17 +01:00
Danny Al-Gaaf
6ae10fe7fc Client.cc: don't pass c_str() if std::string is expected
Don't pass c_str() to _lookup(). The function expect a std::string
as second parameter.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-25 15:28:37 +01:00
Danny Al-Gaaf
350481f90f Paxos.h: fix dangerouse use of c_str()
No need to use c_str() in get_statename(), simply return a
std::strin instead.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-25 14:10:20 +01:00
Sage Weil
9217c4ac68 debian: make gdisk, parted requirements, not recommendations.
ceph-prepare-disk (and thus ceph-deploy) need this.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-24 13:31:06 -08:00
Sage Weil
0be28af0bb Merge remote-tracking branch 'gh/next' 2013-02-24 13:22:47 -08:00
Neil Levine
35c951f362 Minor wording change.
Signed-off-by: Neil Levine <neil.levine@inktank.com>
2013-02-24 07:24:27 -08:00
Neil Levine
6bae2a5d46 Grammar typo
Signed-off-by: Neil Levine <neil.levine@inktank.com>
2013-02-24 07:24:27 -08:00
Neil Levine
3896896cf4 Changes to the OS support, multi-data center, and hypervisor questions.
Signed-off-by: Neil Levine <neil.levine@inktank.com>
2013-02-24 07:24:21 -08:00
Sage Weil
0cd215ee5b mds: reencode MDSMap in MMDSMap if MDSENC feature is not present
In some cases the MMDSMap message from mon -> client passes from leader ->
peon -> client, and the leader doesn't encode with the correct feature
bits.  As with MMOSDMap, we reencode the nested MDSMap based on the
features if relevant bits are not present.

We forgot to include this with the mds encoding changes.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-23 16:36:52 -08:00
Sage Weil
c07e8ea7dd qa/run_xfstests.sh: use $TESTDIR instead of /tmp/cephtest
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-23 08:38:10 -08:00
Sage Weil
8235b16c1a osd: an interval can't go readwrite if its acting is empty
Let's not forget that min_size can be zero.

Fixes: #4159
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 4277265d99)
2013-02-23 08:34:07 -08:00
Sage Weil
704db85013 mkcephfs: create mon data dir prior to ceph-mon --mkfs
ceph-mon now expects this directory to already exist.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-22 16:24:23 -08:00
John Wilkins
10f50d353e doc: Added a lot of info to OSD troubleshooting.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-22 15:38:20 -08:00
John Wilkins
e68f2c85d3 doc: Added mention of Admin Socket interface and brief description.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-22 15:37:03 -08:00
John Wilkins
73317bd78e doc: Changed title to OSD and PG, indicating both subjects are covered.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-22 15:35:24 -08:00
John Wilkins
ab7039d616 doc: Added references from monitoring OSD to troubleshooting OSD.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-22 15:34:38 -08:00
John Wilkins
97cc738963 doc: set maxdepth to 2, so TOC isn't so long with new OSD troubleshooting.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-22 15:33:43 -08:00
Sage Weil
7c94083643 client: use 4MB f_bsize and f_frsize for statfs
Old stat(1) reports:

  Block size: 1048576    Fundamental block size: 1048576

and the df(1) arithmetic works out.  New stat(1) reports:

  Block size: 1048576    Fundamental block size: 4096

which is what we are shoving into statvfs, but we have the b_size and
fr_size arithmetic swapped.  However, doing the *correct* reporting would
then break the old stat by making both sizes appear to be 4KB (or
whatever).

Sidestep the issue by making *both* values 4MB.. which is both large enough
to report large FS sizes, and also the default stripe size and thus a
"reasonable" value to report for a block size.

Perhaps in the future, when we no longer care about old userland, we can
report the page size for f_bsize, which is probably the "most correct"
thing to do.

Fixes: #3794.  See also #3793.
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-02-22 15:15:31 -08:00
Sage Weil
64267eb3d8 test/librados/watch_notify: fix warning
In file included from test/librados/watch_notify.cc:8:0:
../src/gtest/include/gtest/gtest.h: In function ‘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: instantiated 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/librados/watch_notify.cc:67:224: 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>
2013-02-22 14:57:45 -08:00
Sage Weil
53586e71f3 ceph-object-corpus: re-update
This was set by 9af94eea20, then single
paxos merge, then accidentally reverted by the next commit
6cb53740f2.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-22 14:40:10 -08:00
Samuel Just
2dae6a68ee PG::proc_replica_log: oinfo.last_complete must be *before* first entry in omissing
Fixes: #4189
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-02-22 14:19:55 -08:00
Sage Weil
e4fd70fcec Merge remote-tracking branch 'gh/wip-rbd-flatten-deadlock'
Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-22 14:23:45 -08:00
Sage Weil
e03657e452 Merge remote-tracking branch 'gh/wip-objecter-fsx'
Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-22 14:16:07 -08:00
David Zafman
d612a9abac Merge branch 'wip-3403-4-rebase'
Feature: #3403

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-02-22 12:50:19 -08:00
Josh Durgin
3105034067 objecter: don't resend linger ops unnecessarily
recalc_linger_op_target() was checking and then setting
linger_op->pgid and linger_op->active, but these were only set by
recalc_linger_op_target(). This was only called by handle_osd_map(),
so the first osdmap after a watch was established would cause a resend
of the watch. Analogous to the normal Op, set this information by
calling recalc_linger_op_target in send_linger().

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-02-21 23:33:46 -08:00