Commit Graph

26249 Commits

Author SHA1 Message Date
Sage Weil
6afc22a158 Merge remote-tracking branch 'gh/last' 2013-05-28 22:10:21 -07:00
Sage Weil
b6be785775 Merge branch 'wip-5172'
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-05-28 20:44:48 -07:00
Sage Weil
dd35c26e5b osd: fix note_down_osd
Fix bug introduced in 27381c0c62.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-28 20:39:33 -07:00
Sage Weil
45b84f39ba osd: fix hb con failure handler
Fix a few bugs introduced by 27381c0c62:

- check against both front and back cons; either one may have failed.
- close *both* front and back before reopening either.  this is
  overkill, but slightly simpler code.
- fix leak of con when marking down
- handle race against osdmap update and note_down_osd

Fixes: #5172
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-28 20:39:30 -07:00
Sage Weil
ce6fc2ed87 Merge pull request #319 from dalgaaf/wip-da-pylint-3
Fix some smaller Python issues
2013-05-28 19:52:41 -07:00
Sage Weil
648dcb9240 Merge pull request #326 from dalgaaf/wip-da-CID-727978
kv_flat_btree_async.cc: fix AioCompletion resource leak
2013-05-28 15:48:11 -07:00
Gary Lowell
054e96cf79 v0.63 2013-05-28 13:58:22 -07:00
Samuel Just
5bca9c38ef HashIndex: sync top directory during start_split,merge,col_split
Otherwise, the links might be ordered after the in progress
operation tag write.  We need the in progress operation tag to
correctly recover from an interrupted merge, split, or col_split.

Fixes: #5180
Backport: cuttlefish, bobtail
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-05-28 12:47:51 -07:00
Sage Weil
e8f5284026 Merge pull request #325 from dalgaaf/wip-da-CID-727980
kv_flat_btree_async.cc: fix AioCompletion resource leak
2013-05-28 10:27:56 -07:00
Sage Weil
16e6b081b3 Merge pull request #324 from dalgaaf/wip-da-CID-727979
kv_flat_btree_async.cc: fix AioCompletion resource leak
2013-05-28 10:27:25 -07:00
Sage Weil
b528a915f6 osd/OSDMap: fix Incremental dump
The front hb addr entry may not be present.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-28 09:17:05 -07:00
Sage Weil
8e982071c0 Merge pull request #322 from guilhem/patch-1
Reviewed-by: Sage Weil <sage@inktank.com>
2013-05-28 08:43:10 -07:00
Danny Al-Gaaf
478b576a71 kv_flat_btree_async.cc: fix AioCompletion resource leak
Call AioCompletion::release() if the completion is no longer needed.

CID 727978 (#1-2 of 2): Resource leak (RESOURCE_LEAK)
  leaked_storage: Variable "obj_aioc" going out of scope leaks the
  storage it points to.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-28 12:43:12 +02:00
Danny Al-Gaaf
e6efc39fad kv_flat_btree_async.cc: fix AioCompletion resource leak
Call AioCompletion::release() if the completion is no longer needed.

CID 727979 (#1-2 of 2): Resource leak (RESOURCE_LEAK)
  leaked_storage: Variable "a" going out of scope leaks the storage
  it points to.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-28 12:38:57 +02:00
Danny Al-Gaaf
6939b12492 kv_flat_btree_async.cc: fix AioCompletion resource leak
Call AioCompletion::release() if the completion is no longer
needed.

CID 727980 (#1-4 of 4): Resource leak (RESOURCE_LEAK)
  leaked_storage: Variable "aioc" going out of scope leaks
  the storage it points to.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-28 12:27:37 +02:00
Guilhem Lettron
554b41b171 Remove mon socket in post-stop
If ceph-mon segfault, socket file isn't removed.

By adding a remove in post-stop, upstart clean run directory properly.

Signed-off-by: Guilhem Lettron <guilhem@lettron.fr>
2013-05-28 10:35:24 +02:00
Sage Weil
a6df7644b6 PendingReleaseNotes: notes about enabling HASHPSPOOL
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-27 21:17:06 -07:00
Sage Weil
aa0649c66b osdmaptool: fix cli tests
Now that the default pool flags have changed.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-27 21:17:04 -07:00
Sage Weil
f0958c36fd Merge pull request #321 from dalgaaf/wip-da-CID-727981
kv_flat_btree_async.cc: fix AioCompletion resource leak
2013-05-27 13:55:54 -07:00
Sage Weil
35a8c6160c Merge pull request #320 from dalgaaf/wip-da-CID-727983
kv_flat_btree_async.cc: fix resource leak
2013-05-27 13:55:24 -07:00
John Wilkins
615b54c6e4 doc: Updated rgw.conf example.
fixes: #4608

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-05-25 15:13:01 -07:00
John Wilkins
6f935419e6 doc: Updated RGW Quickstart.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-05-25 15:11:49 -07:00
John Wilkins
e59897c8b2 doc: Updated index for newer terms.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-05-25 15:11:06 -07:00
Samuel Just
6d1e14e045 pg_pool_t: enable FLAG_HASHPSPOOL by default
Fixes: #5160
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-05-24 16:21:48 -07:00
Danny Al-Gaaf
0f5474834a kv_flat_btree_async.cc: fix AioCompletion resource leak
Call AioCompletion::release() if the completion is no longer
needed to free the resources.

CID 727981 (#3 of 3): Resource leak (RESOURCE_LEAK)
  leaked_storage: Variable "top_aioc" going out of scope leaks the
  storage it points to.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-24 14:50:34 +02:00
Danny Al-Gaaf
7b438e131b kv_flat_btree_async.cc: fix resource leak
Call AioCompletion::release() if the completion is no longer
needed to free the resources.

CID 727983 : Resource leak (RESOURCE_LEAK)
  leaked_storage: Variable "aioc" going out of scope leaks the
  storage it points to.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-24 14:43:17 +02:00
Danny Al-Gaaf
9785478a2a ceph-disk: remove unnecessary semicolons
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-24 12:46:15 +02:00
Danny Al-Gaaf
16ecae153d ceph-disk: cast output of _check_output()
Cast output of _check_output() to str() to be able to use
str.split().

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-24 12:41:11 +02:00
Danny Al-Gaaf
9429ff90a0 ceph-disk: fix undefined variable
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-24 12:33:16 +02:00
Danny Al-Gaaf
c127745cc0 ceph-disk: add missing spaces around operator
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-24 12:29:07 +02:00
Samuel Just
8c1c2d98c6 Merge branch 'wip_scrub_tphandle' into next
Fixes: #5159
Reviewed-by: Sage Weil <sage@inktank.com>
2013-05-23 20:08:54 -07:00
Samuel Just
86822485e5 PG: ping tphandle during omap loop as well
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-05-23 19:42:32 -07:00
Samuel Just
d62716dd4c PG: reset timeout in _scan_list for each object, read chunk
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-05-23 19:42:32 -07:00
Samuel Just
b8a25e08a6 OSD,PG: pass tphandle down to _scan_list
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-05-23 19:42:32 -07:00
John Wilkins
bb407bfd10 doc: Updated Ceph FS Quick Start.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-05-23 17:02:17 -07:00
John Wilkins
7c497d95db doc: Added troubleshooting to Ceph FS index.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-05-23 17:01:51 -07:00
John Wilkins
3dda794a66 doc: Added separate troubleshooting for MDS and Ceph FS.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-05-23 17:01:29 -07:00
Yehuda Sadeh
8b3a04dec8 rgw: iterate usage entries from correct entry
Fixes: #5152
When iterating through usage entries, and when user id was
provided, we started at the user's first entry and not from
the entry indexed by the request start time.
This commit fixes the issue.

Backport: bobtail

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-05-23 13:11:01 -07:00
John Wilkins
75600c6aaf doc: Updates for ceph-deploy and cuttlefish.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-05-23 11:45:14 -07:00
Sage Weil
87cef3d5c3 mon: drop unnecessary conditionals
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-23 10:23:43 -07:00
Sage Weil
6af640517f Merge pull request #311 from ceph/wip-5102
Reviewed-by: Sage Weil <sage@inktank.com>
2013-05-23 10:21:51 -07:00
Sage Weil
8b2fbf21b8 Merge pull request #312 from ceph/wip-osd-hb
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-05-23 10:17:14 -07:00
Sage Weil
e8d0dc762f Merge branch 'next' 2013-05-23 08:49:10 -07:00
Xiaoxi Chen
e09e94424b modified: src/init-ceph.in
fixed bug in init script, the "df" should be run on remote host by do_cmd,
	and use $host instead of "hostname -s"

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
(cherry picked from commit 1dd99f0fc9)

Conflicts:

	src/init-ceph.in
2013-05-23 08:48:24 -07:00
Sage Weil
f9ec5a7945 msgr: increase port range to 6900-7300 (from -7100)
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-23 08:46:18 -07:00
Sage Weil
2802430af7 Merge pull request #307 from xiaoxichen/master
Reviewed-by: Sage Weil <sage@inktank.com>
2013-05-23 08:45:55 -07:00
Xiaoxi Chen
1dd99f0fc9 modified: src/init-ceph.in
fixed bug in init script, the "df" should be run on remote host by do_cmd,
	and use $host instead of "hostname -s"

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
2013-05-23 09:33:27 +08:00
Sage Weil
27381c0c62 osd: ping both front and back interfaces
Send ping requests to both the front and back hb addrs for peer osds.  If
the front hb addr is not present, do not send it and interpret a reply
as coming from both.  This handles the transition from old to new OSDs
seamlessly.

Note both the front and back rx times.  Both need to be up to date in order
for the peer to be healthy.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-22 16:13:37 -07:00
Sage Weil
92a558bf0e msgr: add Messenger reference to Connection
This allows us to get the messenger associated with a connection.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-22 16:13:37 -07:00
Sage Weil
28851424bf msgr: take an arbitrary set of ports to avoid binding to
We used to only need to avoid 2 ports; now we need 3.  Make it a set so we
don't have this problem later.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-22 16:13:37 -07:00