Commit Graph

20164 Commits

Author SHA1 Message Date
Samuel Just
18fec69aae OSD,PG::scrub() move pg->put() into queue process
This clarifies ownership of the pg reference.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-07-05 10:14:57 -07:00
Sage Weil
7fa85790fb osd: add missing formatter close_section() to scrub status
Also add braces to make the open/close matchups easier to see.  Broken
by f366173927.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-04 13:59:04 -07:00
Sage Weil
c0b01cda10 Merge branch 'stable'
Conflicts:
	src/test/cli/radosgw-admin/help.t
2012-07-04 09:30:21 -07:00
Wido den Hollander
f67fe4e368 librados: Bump the version to 0.48
Signed-off-by: Wido den Hollander <wido@widodh.nl>
Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-04 09:21:01 -07:00
Samuel Just
bcfcf8efd5 librados: add assert_version as an operation on an ObjectOperation
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-07-04 07:32:23 -07:00
Samuel Just
39eaa23076 ReplicatedPG: do not set reply version to last_update
The version should be oi.user_version as set above.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-07-04 07:29:12 -07:00
Sage Weil
e6e36c0a72 rgw: initialize fields of RGWObjEnt
This fixes various valgrind warnings triggered by the s3test
test_object_create_unreadable.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-04 07:27:32 -07:00
Sage Weil
f6cdd85223 Merge remote-tracking branch 'gh/wip-crush' 2012-07-03 16:49:29 -07:00
Yehuda Sadeh
35b9ec881a rgw-admin: use correct modifier with strptime
Bug #2658: used %I (12h) instead of %H (24h)

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-07-03 16:24:28 -07:00
Yehuda Sadeh
da251fe885 rgw: send both swift x-storage-token and x-auth-token
older clients need x-storage-token, newer x-auth-token

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-07-03 16:24:20 -07:00
Yehuda Sadeh
4c19ecb9a3 rgw: radosgw-admin date params now also accept time
The date format now is "YYYY-MM-DD[ hh:mm:ss]". Got rid of
the --time param for the old ops log stuff.

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

Conflicts:

	src/test/cli/radosgw-admin/help.t
2012-07-03 16:23:42 -07:00
Yehuda Sadeh
6958aeb898 rgw-admin: fix usage help
s/show/trim

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-07-03 16:10:22 -07:00
Tommi Virtanen
ad97415ef7 ceph-disk-prepare: Partition and format OSD data disks automatically.
Uses gdisk, as it seems to be the only tool that can automate GPT uuid
changes. Needs to run as root.

Adds Recommends: gdisk to ceph.deb.

Closes: #2547
Signed-off-by: Tommi Virtanen <tv@inktank.com>
2012-07-03 15:25:52 -07:00
John Wilkins
a1696fe0f3 doc: removed /srv/osd.$id.journal from ceph.conf example.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-07-03 14:20:34 -07:00
caleb miles
8f64647805 CrushTester.cc: remove BOOST dependencies.
remove calls to BOOST libraries for computing Chi-squared statistics and
producing discrete random variables with a given probability distribution.

Signed-off-by: caleb miles <caleb.miles@inktank.com>
2012-07-03 14:16:51 -07:00
John Wilkins
7e23aad6c5 doc: Updates to 5-minute quick start.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-07-03 14:14:42 -07:00
Sage Weil
83c043f803 radosgw-admin: fix clit test
Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-03 14:07:16 -07:00
Sage Weil
ec0588e770 Merge branch 'wip-config' 2012-07-03 13:04:36 -07:00
Sage Weil
c667f5d7d8 lockdep: increase max locks
Hit this limit with the rados api tests.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-03 13:04:28 -07:00
Sage Weil
12ba580f0c config: add unlocked version of get_my_sections; use it internally
Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-03 12:07:28 -07:00
Sage Weil
5674158163 ceph: fix cli help test
Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-03 11:51:25 -07:00
John Wilkins
c11ca33b69 Merge branch 'master' of github.com:ceph/ceph 2012-07-03 11:48:31 -07:00
John Wilkins
fc18cca0aa doc: Clean up of 5-minute quick start.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-07-03 11:48:15 -07:00
Samuel Just
151bf0eef5 ReplicatedPG: remove faulty scrub assert in sub_op_modify_applied
This assert assumed that all ops submitted before MOSDRepScrub was
submitted were processed by the time that MOSDRepScrub was
processed.  In fact, MOSDRepScrub's scrub_to may refer to a
last_update yet to be seen by the replica.

Bug #2693

Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-07-03 11:30:44 -07:00
Samuel Just
8ade74b241 ReplicatedPG: remove faulty scrub assert in sub_op_modify_applied
This assert assumed that all ops submitted before MOSDRepScrub was
submitted were processed by the time that MOSDRepScrub was
processed.  In fact, MOSDRepScrub's scrub_to may refer to a
last_update yet to be seen by the replica.

Bug #2693

Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-07-03 11:30:08 -07:00
John Wilkins
09dd8cad36 doc: Updating Getting Started with 5-minute quick start.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-07-03 11:21:43 -07:00
Kyle Bader
32833e88a1 ceph: better usage
Signed-off-by: Kyle Bader <kyle.bader@dreamhost.com>
2012-07-03 11:20:43 -07:00
John Wilkins
da24208dcd Merge branch 'master' of github.com:ceph/ceph 2012-07-03 11:18:11 -07:00
John Wilkins
8c95b5c8ae doc: restructuring quick start section.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-07-03 11:17:50 -07:00
Samuel Just
4bd7c05b84 IoCtxImpl: pass objver pointer to aio_operate_read
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-07-03 11:10:54 -07:00
Tommi Virtanen
4e774fbcb3 ceph-disk-prepare: Take fsid from config file.
Closes: #2546.

Signed-off-by: Tommi Virtanen <tv@inktank.com>
2012-07-03 09:24:09 -07:00
Sage Weil
cd0314d1a2 config: remove bad argparse_flag argument in parse_option()
This is wrong, and thankfully valgrind picks it up.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-03 09:21:47 -07:00
Sage Weil
67455c2187 debian: strip new ceph-mds package
Reported-by: Amon Ott <a.ott@m-privacy.de>
Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-03 09:20:35 -07:00
John Wilkins
6bb19e74c0 doc: Cleaned up rbd snapshots.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-07-03 08:46:14 -07:00
Sage Weil
ad61bbd19e config: fix lock recursion in get_val_from_conf_file()
Introduce a private, already-locked version.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-03 08:20:06 -07:00
Sage Weil
7009c32ee7 config: fix recursive lock in parse_config_files()
The _impl() helper is only called from parse_config_files(); don't retake
the lock.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-03 08:15:08 -07:00
Sage Weil
b53cdb97d1 config: remove bad argparse_flag argument in parse_option()
This is wrong, and thankfully valgrind picks it up.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-03 06:46:10 -07:00
Sage Weil
14ec778263 client: improve dump_cache output
Hunting #1737.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-02 21:08:27 -07:00
Sage Weil
8b462019f2 doc: release notes for 0.48
Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-02 20:20:14 -07:00
Sage Weil
562cad6666 doc: 'Configuring a Storage Cluster' -> 'Configuration'
Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-02 20:18:51 -07:00
Sage Weil
d347cc8942 v0.48argonaut
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJP8iluAAoJEH6/3V0X7TFtnFsQAI9z65MWcZNi0nbXmLRudBfM
 0IrcP8bmDAY9D9F45jVxhnJlumxv1FJFBNYXwNkFC/+6jhhevsnIstjYzactPyGt
 C52gapsgjW5S5BSZBAZjyE0zfP9Iu0s7UhxhdABsRkcOnHFJdrXebkNWL4x7I3st
 Sok5LyL6EyIcTNDFYGajOARMbNSi71j8Ys67onPMJaGFenQD0mcgd9bJMmun99Xt
 DQEMOFRXEQydjbO9tAiWLWN6ws/nugcsdJggGqny2Z0AqqiHRejOPyVovsVX63jK
 r9psFdPDMGFWXa11KIj3mihRXQZoSlqbibYhGBgOYtfsaAkegOmoyS/YNcumDY0G
 2w+6azQkmKqRMytgPD1tBCZV6pLoPtROUBXoKn4Enul41FWKzPidGsqKh7mSZSaz
 7/Zl0Y7Blgtbtfh6V2kJwKpoeNNVhXsXRFnlyKnH+SszUOdzsLVZHoH5GwptpCD/
 dxeeXXjmK1J87p08Ze/hy7GqFlEam8yRHukzF9G4V62Yggy/ZIi75uoyxydBWbxr
 mOpbNGl5Ckl925LAMSTu3Dkj1n1C0gJUe+OJHUof6F2Dncczhr1Cjtgq/Fp0YXYz
 8XyPhjN43HnkIgW/ogRtPnJVjHv7Z4HMFUfRS3szWzWp7wZABe7ULRvnZcCDaPb0
 O04ycKNKttq0YAOzNM5M
 =DzUX
 -----END PGP SIGNATURE-----

Merge tag 'v0.48argonaut'

v0.48argonaut
2012-07-02 21:24:56 -07:00
Sage Weil
030478e299 Merge branch 'wip-msgr' 2012-07-02 17:54:35 -07:00
Sage Weil
b5287c19d4 lockdep: enable in common_init
Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-02 17:54:26 -07:00
Sage Weil
f7d4e39740 msgr: restart_queue when replacing existing pipe and taking over the queue
The queue may have been previously stopped (by discard_queue()), and needs
to be restarted.

Fixes consistent failures from the mon_recovery.py integration tests.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-02 17:54:00 -07:00
Sage Weil
5dfd2a512d msgr: choose incoming connection if ours is STANDBY
If the connect_seq matches, but our existing connection is in STANDBY, take
the incoming one.  Otherwise, the other end will wait indefinitely for us
to connect but we won't.

Alternatively, we could "win" the race and trigger a connection by sending
a keepalive (or similar), but that is more work; we may as well accept the
incoming connection we have now.

This removes STANDBY from the acceptable WAIT case states.  It also keeps
responsibility squarely on the shoulders of the peer with something to
deliver.

Without this patch, a 3-osd vstart cluster with
'ms inject socket failures = 100' and rados bench write -b 4096 would start
generating slow request warnings after a few minutes due to the osds
failing to connect to each other.  With the patch, I complete a 10 minute
run without problems.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-02 17:54:00 -07:00
Sage Weil
b7007a159f msgr: preserve incoming message queue when replacing pipes
If we replace an existing pipe with a new one, move the incoming queue
of messages that have not yet been dispatched over to the new Pipe so that
they are not lost.  This prevents messages from being lost.

Alternatively, we could set in_seq = existing->in_seq - existing->in_qlen,
but that would make the other end resend those messages, which is a waste
of bandwidth.

Very easy to reproduce the original bug with 'ms inject socket failures'.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-02 17:54:00 -07:00
Sage Weil
1f3a722e15 msgr: move dispatch_entry into DispatchQueue class
A bit cleaner.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-02 17:54:00 -07:00
Sage Weil
03445290da msgr: move incoming queue to separate class
This extricates the incoming queue and its funky relationship with
DispatchQueue from Pipe and moves it into IncomingQueue.  There is now a
single IncomingQueue attached to each Pipe.  DispatchQueue is now no
longer tied to Pipe.

This modularizes the code a bit better (tho that is still a work in
progress) and (more importantly) will make it possible to move the
incoming messages from one pipe to another in accept().

Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-02 17:54:00 -07:00
Sage Weil
0dbc541695 msgr: make D_CONNECT constant non-zero, fix ms_handle_connect() callback
A while ago we inadvertantly broke ms_handle_connect() callbacks because
of a check for m being non-zero in the dispatch_entry() thread.  Adjust the
enums so that they get delivered again.

This fixes hangs when, for example, the ceph tool sends a command, gets a
connection reset, and doesn't get the connect callback to resend after
reconnecting to a new monitor.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-02 17:54:00 -07:00
Sage Weil
2429556a51 msgr: fix pipe replacement assert
We may replace an existing pipe in the STANDBY state if the previous
attempt failed during accept() (see previous patches).

This might fix #1378.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-07-02 17:54:00 -07:00