Danny Al-Gaaf
b66b8ddff9
common/admin_socket.cc: remove scope of ret variable in do_accept()
...
Reduce scope of ret variable and remove usage in one case.
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-10 19:19:58 +02:00
Danny Al-Gaaf
e7d111406b
cls/rbd/cls_rbd.cc: reduce scope of variable rc
...
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-10 19:19:58 +02:00
Danny Al-Gaaf
cdfc4a7ea9
rgw/rgw_op.cc: use empty() instead of size()
...
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-10 19:19:58 +02:00
Danny Al-Gaaf
45ffb36bba
ceph-filestore-dump.cc: use empty() instead of size()
...
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-10 19:19:58 +02:00
Samuel Just
b353da6f68
Merge branch 'wip_pg_res'
...
Reviewed-by: Sage Weil <sage@inktank.com>
2013-05-09 22:24:31 -07:00
Samuel Just
01a07c1ee1
OSD: rename clear_temp to recursive_remove_collection()
...
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-05-09 22:23:46 -07:00
Samuel Just
f5a60ca226
osd: remove_dir use collection_list_partial
...
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-05-09 22:23:42 -07:00
Samuel Just
d3dd99b725
PG: no need to wait on DeletingStateRef for flush
...
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-05-09 17:28:15 -07:00
Samuel Just
0ef9b1e049
osd_internals/pg_removal.rst: update for pg resurrection
...
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-05-09 17:28:15 -07:00
Samuel Just
90f50c487a
OSD: add pg deletion cancelation
...
DeletingState now allows _create_lock_pg() to attempt to cancel
pg deletion.
PG::init() must mark the PG as backfill iff we stopped a deletion.
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-05-09 17:28:15 -07:00
Samuel Just
b274c8a0b2
common/sharedptr_registry.hpp: add remove
...
remove() can be used to clear an entry before all of its
references are removed.
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-05-09 17:28:15 -07:00
John Wilkins
c55c6abb60
Merge branch 'master' of https://github.com/ceph/ceph
2013-05-09 12:49:59 -07:00
John Wilkins
270ca6232d
doc: Updated doc for connectivity. Updated text with glossary terms.
...
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-05-09 12:48:59 -07:00
John Wilkins
e4173123d4
doc: Updated disk syntax. Updated text with glossary terms.
...
fixes : #4933
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-05-09 12:48:14 -07:00
Sage Weil
c191461636
Merge pull request #267 from ceph/wip-coverity
...
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-05-09 12:47:47 -07:00
John Wilkins
af9192871c
doc: Added connectivity section. Updated doc with glossary terms.
...
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-05-09 12:46:03 -07:00
John Wilkins
f1b13a1796
doc: Added the non-implemented bit for the gateway to the dev/radosgw TOC.
...
fixes : #4978
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-05-09 12:22:21 -07:00
Samuel Just
69b64826b7
OSD: don't rename pg collections, handle PGs in RemoveWQ
...
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-05-09 12:20:24 -07:00
John Wilkins
827fd108b6
Merge branch 'master' of https://github.com/ceph/ceph
2013-05-09 12:09:00 -07:00
John Wilkins
fe164e4438
doc: Republishing the admin operations API for the gateway.
...
fixes : #4978
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-05-09 12:08:28 -07:00
John Wilkins
d4732e853c
doc: Republishing the admin operations API for the gateway.
...
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-05-09 12:07:05 -07:00
caleb miles
da271f7f78
doc: Document admin api web interface.
...
Signed-off-by: caleb miles <caleb.miles@inktank.com>
2013-05-09 11:15:01 -07:00
Sage Weil
499edd8bfc
osd: initialize OSDService::next_notif_id
...
CID 1019627 (#1 of 1): Uninitialized scalar field (UNINIT_CTOR)
2. uninit_member: Non-static class member "next_notif_id" is not initialized in this constructor nor in any functions that it calls.
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-09 10:49:00 -07:00
Sage Weil
e30a03210c
osd: init test_ops_hook
...
CID 1019628 (#1 of 1): Uninitialized pointer field (UNINIT_CTOR)
2. uninit_member: Non-static class member "test_ops_hook" is not initialized in this constructor nor in any functions that it calls.
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-09 10:49:00 -07:00
Sage Weil
72b5629a7c
rbd: fix buffer leak in do_import
...
CID 1019580 (#2 of 2): Resource leak (RESOURCE_LEAK)
10. leaked_storage: Variable "p" going out of scope leaks the storage it points to.
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-09 10:49:00 -07:00
Sage Weil
2bc0883072
librbd: fix possible use-after-free
...
(of the pointer)
CID 966634 (#1 of 1): Use after free (USE_AFTER_FREE)
2. use_after_free: Using freed pointer "ictx".
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-09 10:49:00 -07:00
Sage Weil
4a90af8dfa
ceph-filestore-dump: fix uninit fields in ctor
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-09 10:49:00 -07:00
Sage Weil
99958e2032
rgw: fix various uninit class fields
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-09 10:48:59 -07:00
Sage Weil
ad073c2b03
radosgw-admin: fix fd leak in read_input()
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-09 10:48:59 -07:00
Sage Weil
110a823fd4
rados: fix fd leak
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-09 10:48:59 -07:00
Sage Weil
3dc7c3295b
rados: fix buffer leak
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-09 10:48:59 -07:00
Sage Weil
4087e425d6
os/Filestore: fix fd leak in error path
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-09 10:48:59 -07:00
Sage Weil
8632707656
mon: fix Formatter leak
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-09 10:48:59 -07:00
Sage Weil
76b9024005
mds: fix fd leak
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-09 10:48:58 -07:00
Sage Weil
5433462d86
doc/release-notes: v0.61.1 release notes
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-09 10:04:05 -07:00
Sage Weil
5177fcb6bf
Merge remote-tracking branch 'gh/next'
...
Conflicts:
src/mon/MonitorDBStore.h
2013-05-08 17:45:03 -07:00
Samuel Just
6c1e479178
mon: dump MonitorDBStore transactions to file
...
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit 797089ef08
)
2013-05-08 16:55:06 -07:00
Sage Weil
5a631b852d
osd: optionally enable leveldb logging
...
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 0b4c5c1a33
)
2013-05-08 16:55:04 -07:00
Sage Weil
bb4f65ae9c
mon: allow leveldb logging
...
'mon leveldb log = filename'
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit c1d5f81554
)
2013-05-08 16:55:02 -07:00
Sage Weil
a284c9ece8
common/Preforker: fix warnings
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-08 16:42:24 -07:00
Gary Lowell
3ebddf17cb
debian/control: squeeze requres cryptsetup package
...
Squeeze requires the cryptsetup package which has been renamed
cryptsetup-bin in later versions. Allow either package to
satisfy the dependency.
Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
(cherry picked from commit 83bbae415de16f708ca1cb24861ddbb0bd514a7f)
2013-05-08 16:36:42 -07:00
Gary Lowell
83bbae415d
debian/control: squeeze requres cryptsetup package
...
Squeeze requires the cryptsetup package which has been renamed
cryptsetup-bin in later versions. Allow either package to
satisfy the dependency.
Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
2013-05-08 16:33:05 -07:00
Sage Weil
e2528ae42c
ceph-create-keys: gracefully handle no data from admin socket
...
Old ceph-mon (prior to 393c9372f82ef37fc6497dd46fc453507a463d42) would
return an empty string and success if the command was not registered yet.
Gracefully handle that case by retrying.
If we still fail to parse, exit entirely with EINVAL.
Fixes : #4952
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@intank.com>
2013-05-08 14:54:33 -07:00
Sage Weil
f2a54cc9c9
init-ceph: fix osd_data location when checking df utilization
...
Do not assume default osd data location.
Fixes : #4951
Backport: cuttlefish, bobtail
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Gary Lowelll <gary.lowell@inktank.com>
2013-05-08 14:35:54 -07:00
athanatos
0d8f7a092f
Merge pull request #266 from ceph/wip-4949
...
osd: don't assert if get_omap_iterator() returns NULL
Reviewed-by: Sam Just <sam.just@inktank.com>
2013-05-08 12:15:30 -07:00
Yehuda Sadeh
36ec6f9bce
osd: don't assert if get_omap_iterator() returns NULL
...
Fixes : #4949
This can happen if the object does not exist and it's
a write operation. Just return -ENOENT.
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-05-08 12:18:49 -07:00
Sage Weil
a89d889b0d
Merge pull request #165 from dachary/wip-4321
...
unit tests for FileStore::_detect_fs when running on ext4
2013-05-08 11:44:24 -07:00
Yehuda Sadeh
3846451548
rgw: user operation mask
...
Fixes : #4716
add user operation mask for controlling user permissions.
Also add admin controls for it.
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-05-08 11:35:57 -07:00
Josh Durgin
cdb3d32ef5
Merge pull request #180 from ceph/wip-rados-clone
...
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-05-08 11:26:04 -07:00
Samuel Just
61354b21d3
Merge branch 'wip_split_upgrade' into next
...
Fixes : #4927
2013-05-08 11:14:11 -07:00