]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agomon: provide encoded canonical full OSDMap from primary 3247/head
Sage Weil [Tue, 23 Dec 2014 20:39:08 +0000 (12:39 -0800)]
mon: provide encoded canonical full OSDMap from primary

Currently we make each monitor apply the incremental and encode the full
map locally.  The original motivation was to save bandwidth, but the
savings are minimal to modest and the complexity associated with doing this
is huge.

This strategy also causes problems now that we have OSDMap crc's and old
mons/clusters may have diverging full OSDMaps due to mixed version
clusters.  See #10422

Instead, include the encoded full map in the paxos transaction.  We will
still apply the incremental and check the crc, but if it fails and we have
the correct version, reload it from disk and move on.  If we don't, we
will continue as we have before--the primary mon doesn't have support for
crc's yet.  When it does we will start verifying and/or get our
full map back into sync.

Fixes: #10422
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agolibrados: only call watch_flush if necessary
Haomai Wang [Tue, 23 Dec 2014 10:38:24 +0000 (18:38 +0800)]
librados: only call watch_flush if necessary

Fix bug #10424
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
(cherry picked from commit 926a1b7468550e0c83bfa68bd45df1a6af599727)

10 years agomds: add default ctor for quota_info_t
Loic Dachary [Sat, 20 Dec 2014 00:08:33 +0000 (01:08 +0100)]
mds: add default ctor for quota_info_t

http://tracker.ceph.com/issues/10400 Fixes: #10400

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 7f1e510165f284aad3f341ff89f64d5c3e8fe60e)

10 years agolibrados: warn about rados_watch_flush() prior to ioctx shutdown
Sage Weil [Mon, 22 Dec 2014 21:56:07 +0000 (13:56 -0800)]
librados: warn about rados_watch_flush() prior to ioctx shutdown

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1fbe9b6f3a67584829fe17b6bb08cfa1b787d82c)

10 years agolibrados: watch_flush() on shutdown
Sage Weil [Fri, 19 Dec 2014 19:50:38 +0000 (11:50 -0800)]
librados: watch_flush() on shutdown

Users can easily forget this. It makes shutdown potentially block, but if
they have racing callbacks they get what they ask for.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 30678f6daf0a71b6074c061c6b4aec6386372368)

10 years agolibrados: add rados_watch_flush() call
Sage Weil [Fri, 19 Dec 2014 19:48:27 +0000 (11:48 -0800)]
librados: add rados_watch_flush() call

Add a call so that callers can make sure all queued callbacks have
completed before shutting down the ioctx.  This avoids a segv triggered
by the LibRadosWatchNotifyPPTests/LibRadosWatchNotifyPP.WatchNotify2Timeout/1
test due to the ioctx being destroyed when the in-progress callback
does a notify_ack.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 4ebd4b4280cb048547842351f41b38658fb21a6e)

10 years agoosdc/Objecter: do notify completion callback in fast-dispatch context
Sage Weil [Fri, 19 Dec 2014 16:37:00 +0000 (08:37 -0800)]
osdc/Objecter: do notify completion callback in fast-dispatch context

The notify completion has exactly one user, the librados caller which
does nothing but take a local (inner) lock and signal a Cond.  Do this
in the fast-dispatch context for simplicity.

Notably, this makes the notify completion (and timeout) trigger a
notify2() return (with ETIMEDOUT) even when the finisher queue that
normally delivers notify is busy.. for example with a notify that is
being very slow.  In our case, the unit test is doing a sleep(3) to
test timeouts but also prevented the ETIMEDOUT notification from
being delivered to the caller.  This patch resolves that.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 9b78dafd4a80ad9a557cfdf17d10fb2bff236f1a)

10 years agoMerge pull request #3229 from ceph/wip-osd-ctor
Samuel Just [Mon, 22 Dec 2014 19:39:16 +0000 (11:39 -0800)]
Merge pull request #3229 from ceph/wip-osd-ctor

osd/ReplicatedPG: initialize new_backfill in ctor

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3230 from ceph/wip-pg-stat
Sage Weil [Mon, 22 Dec 2014 14:46:21 +0000 (06:46 -0800)]
Merge pull request #3230 from ceph/wip-pg-stat

mon/PGMap: restructure 'pg stat' formatted output

Reviewed-by: John Spray <jspray@redhat.com>
10 years agomon/PGMap: restructure 'pg stat' formatted output 3230/head
Sage Weil [Mon, 22 Dec 2014 14:41:25 +0000 (06:41 -0800)]
mon/PGMap: restructure 'pg stat' formatted output

The + character, which appears in state names, is not a valid XML token.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/ReplicatedPG: initialize new_backfill in ctor 3229/head
Sage Weil [Sun, 21 Dec 2014 15:26:07 +0000 (07:26 -0800)]
osd/ReplicatedPG: initialize new_backfill in ctor

*** CID 1260213:  Uninitialized scalar field  (UNINIT_CTOR)
/osd/ReplicatedPG.cc: 1242 in ReplicatedPG::ReplicatedPG(OSDService *,
std::tr1::shared_ptr<const OSDMap>, const PGPool &, spg_t)()
1236       snap_trimmer_machine(this)
1237     {
1238       missing_loc.set_backend_predicates(
1239         pgbackend->get_is_readable_predicate(),
1240         pgbackend->get_is_recoverable_predicate());
1241       snap_trimmer_machine.initiate();
>>>     CID 1260213:  Uninitialized scalar field  (UNINIT_CTOR)
>>>     Non-static class member "new_backfill" is not initialized in this
constructor nor in any functions that it calls.
1242     }
1243
1244     void ReplicatedPG::get_src_oloc(const object_t& oid, const
object_locator_t& oloc, object_locator_t& src_oloc)
1245     {
1246       src_oloc = oloc;
1247       if (oloc.key.empty())

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3121 from ceph/wip-10277
Gregory Farnum [Fri, 19 Dec 2014 22:45:44 +0000 (14:45 -0800)]
Merge pull request #3121 from ceph/wip-10277

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Fri, 19 Dec 2014 19:55:58 +0000 (11:55 -0800)]
Merge remote-tracking branch 'gh/next'

10 years agoMerge pull request #3199 from ceph/wip-qa-empty-xattr
John Spray [Fri, 19 Dec 2014 17:03:25 +0000 (17:03 +0000)]
Merge pull request #3199 from ceph/wip-qa-empty-xattr

qa: test zero size xattr

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoMerge remote-tracking branch 'gh/wip-fs-quota'
Sage Weil [Fri, 19 Dec 2014 15:45:02 +0000 (07:45 -0800)]
Merge remote-tracking branch 'gh/wip-fs-quota'

Conflicts:
src/client/Client.cc

10 years agoMerge pull request #3218 from dachary/wip-10383-disable-unittest-msgr
Sage Weil [Fri, 19 Dec 2014 15:42:48 +0000 (07:42 -0800)]
Merge pull request #3218 from dachary/wip-10383-disable-unittest-msgr

tests: temporarily disable unittest_msgr

10 years agotests: temporarily disable unittest_msgr 3218/head
Loic Dachary [Fri, 19 Dec 2014 15:21:50 +0000 (16:21 +0100)]
tests: temporarily disable unittest_msgr

http://tracker.ceph.com/issues/10383 Refs: #10383

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #2976 from ceph/wip-pgmeta
Sage Weil [Fri, 19 Dec 2014 15:19:05 +0000 (07:19 -0800)]
Merge pull request #2976 from ceph/wip-pgmeta

osd: move PG metadata to a per-PG object

Passed rados and upgrade tests.

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3212 from ceph/wip-10255-wusui
Sage Weil [Fri, 19 Dec 2014 15:09:33 +0000 (07:09 -0800)]
Merge pull request #3212 from ceph/wip-10255-wusui

Remove sepia dependency (use fqdn)

Backport: giant
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3214 from xinxinsh/wip-cleanup
Sage Weil [Fri, 19 Dec 2014 15:02:39 +0000 (07:02 -0800)]
Merge pull request #3214 from xinxinsh/wip-cleanup

cleanup : remove sync_epoch

Reviewed-by: Sage Weil <sage@redhat.com>
10 years ago0.90 v0.90
Jenkins [Fri, 19 Dec 2014 14:56:22 +0000 (06:56 -0800)]
0.90

10 years agodoc: Instead of using admin socket, use 'ceph daemon' command.
Wido den Hollander [Fri, 19 Dec 2014 14:51:49 +0000 (15:51 +0100)]
doc: Instead of using admin socket, use 'ceph daemon' command.

10 years agoMerge pull request #3193 from nilamdyuti/wip-doc-ceph-disk
Loic Dachary [Fri, 19 Dec 2014 14:36:39 +0000 (15:36 +0100)]
Merge pull request #3193 from nilamdyuti/wip-doc-ceph-disk

Changes format style in ceph-disk to improve readability as html

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3210 from ceph/wip-osdmap
Loic Dachary [Fri, 19 Dec 2014 14:07:56 +0000 (15:07 +0100)]
Merge pull request #3210 from ceph/wip-osdmap

osd: only verify OSDMap crc if it is known

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3216 from cstavr/master
Loic Dachary [Fri, 19 Dec 2014 13:57:11 +0000 (14:57 +0100)]
Merge pull request #3216 from cstavr/master

ceph-disk: Fix wrong string formatting

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph-disk: Fix wrong string formatting 3216/head
Christos Stavrakakis [Fri, 19 Dec 2014 11:46:44 +0000 (13:46 +0200)]
ceph-disk: Fix wrong string formatting

Signed-off-by: Christos Stavrakakis <stavr.chris@gmail.com>
10 years agocleanup : remove sync_epoch 3214/head
xinxin shu [Fri, 19 Dec 2014 01:07:52 +0000 (09:07 +0800)]
cleanup : remove sync_epoch

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
10 years agoRemove sepia dependency (use fqdn) 3212/head
Warren Usui [Wed, 17 Dec 2014 06:01:26 +0000 (22:01 -0800)]
Remove sepia dependency (use fqdn)

Fixes: #10255
Signed-off-by: Warren Usui <warren.usui@inktank.com>
10 years agoMerge pull request #3209 from dmick/wip-stop.sh-me
Loic Dachary [Fri, 19 Dec 2014 00:54:42 +0000 (01:54 +0100)]
Merge pull request #3209 from dmick/wip-stop.sh-me

stop.sh: only try killing processes that belong to me

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoosd: only verfy OSDMap crc if it is known 3210/head
Sage Weil [Fri, 19 Dec 2014 00:49:06 +0000 (16:49 -0800)]
osd: only verfy OSDMap crc if it is known

Only verify we encode a full map with the correct CRC if we actually
have the value in the Incremental.  Otherwise, any map from an old
mon will fail.  And we'll try to request a full map with a message the
old mon doesn't understand.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agostop.sh: only try killing processes that belong to me 3209/head
Dan Mick [Fri, 19 Dec 2014 00:14:43 +0000 (16:14 -0800)]
stop.sh: only try killing processes that belong to me

Signed-off-by: Dan Mick <dan.mick@redhat.com>
10 years agoMerge pull request #3207 from ceph/wip-cot-rename
Loic Dachary [Fri, 19 Dec 2014 00:12:10 +0000 (01:12 +0100)]
Merge pull request #3207 from ceph/wip-cot-rename

ceph_objectstore_tool: Rename generated binary to ceph-objectstore-tool

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3208 from ceph/wip-10326
Dan Mick [Fri, 19 Dec 2014 00:10:34 +0000 (16:10 -0800)]
Merge pull request #3208 from ceph/wip-10326

qa/workunits/rest/test.py: fix pg stat test

10 years agoqa/workunits/rest/test.py: fix pg stat test 3208/head
Sage Weil [Thu, 18 Dec 2014 23:45:48 +0000 (15:45 -0800)]
qa/workunits/rest/test.py: fix pg stat test

Back in e27b0d9e42b7ac3de896c3398689bbdbe03f1bbb we changed pg stat to
not dump everything when a formatter is used.

Fixes: #10326
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3195 from nilamdyuti/wip-doc-ceph-deploy
John Wilkins [Thu, 18 Dec 2014 23:01:50 +0000 (15:01 -0800)]
Merge pull request #3195 from nilamdyuti/wip-doc-ceph-deploy

doc: Changes format style in ceph-deploy to improve readability as html.

Reviewed-by: John Wilkins <jowilkin@redhat.com>
10 years agoMerge pull request #3201 from nilamdyuti/wip-doc-ceph
John Wilkins [Thu, 18 Dec 2014 23:00:37 +0000 (15:00 -0800)]
Merge pull request #3201 from nilamdyuti/wip-doc-ceph

doc: Changes format style in ceph to improve readability as html.

Reviewed-by: John Wilkins <jowilkin@redhat.com>
10 years agoMerge pull request #3057 from ceph/wip-crush-straw
Sage Weil [Thu, 18 Dec 2014 22:13:33 +0000 (14:13 -0800)]
Merge pull request #3057 from ceph/wip-crush-straw

crush: fix straw bucket scaler bugs

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years ago.gitmodules: update ceph-object-corpus auth repo to github
Sage Weil [Tue, 16 Dec 2014 20:10:11 +0000 (12:10 -0800)]
.gitmodules: update ceph-object-corpus auth repo to github

It's annoying having ceph.com for only this repo, and it's not that big.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3101 from yuyuyu101/wip-10147
Sage Weil [Thu, 18 Dec 2014 22:05:16 +0000 (14:05 -0800)]
Merge pull request #3101 from yuyuyu101/wip-10147

Messenger Unit Tests

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3205 from ceph/wip-caps-init
Gregory Farnum [Thu, 18 Dec 2014 19:36:49 +0000 (11:36 -0800)]
Merge pull request #3205 from ceph/wip-caps-init

messages/MClientCaps: init peer.flags

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #3123 from linuxbox2/wip-claim-3
Samuel Just [Thu, 18 Dec 2014 19:23:23 +0000 (11:23 -0800)]
Merge pull request #3123 from linuxbox2/wip-claim-3

Wip claim 3

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3111 from yuyuyu101/wip-10193
Samuel Just [Thu, 18 Dec 2014 19:21:28 +0000 (11:21 -0800)]
Merge pull request #3111 from yuyuyu101/wip-10193

WBThrottle: make bytes/ios/inode_wb's perf counter effective

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3133 from XinzeChi/wip-2
Samuel Just [Thu, 18 Dec 2014 19:20:24 +0000 (11:20 -0800)]
Merge pull request #3133 from XinzeChi/wip-2

OSD: FileJournal: call writeq_cond.Signal if necessary in submit_entry

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3132 from mslovy/optimazation_collection_map
Samuel Just [Thu, 18 Dec 2014 19:19:34 +0000 (11:19 -0800)]
Merge pull request #3132 from mslovy/optimazation_collection_map

os: IndexManager:: optimize map<coll_t, CollectionIndex* > col_indices to unordered_map

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3204 from ceph/wip-osdmap-leak
Loic Dachary [Thu, 18 Dec 2014 18:32:41 +0000 (19:32 +0100)]
Merge pull request #3204 from ceph/wip-osdmap-leak

osd: fix leaked OSDMap

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoAsyncConnection: Fix time event is called after AsyncMessenger destruction 3101/head
Haomai Wang [Tue, 9 Dec 2014 08:55:28 +0000 (16:55 +0800)]
AsyncConnection: Fix time event is called after AsyncMessenger destruction

AsyncConnection uses time event to handle async event partially, but it's not
very effective so here use dispatch_event_external instead.

And if client try to connect to server after a period, it may be call
AsyncConnection::process which will reference to AsyncMessenger. Since
AsyncMessenger doesn't use reference count, it will result in segment
fault. Now we record time event id and delete these registered time events
when stopping connection.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoPipeConnection: Avoid deadlock when calling is_connected
Haomai Wang [Sun, 7 Dec 2014 04:27:38 +0000 (12:27 +0800)]
PipeConnection: Avoid deadlock when calling is_connected

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agotest/msgr/test_msgr: Fix potential unsafe cond wakeup and wrap check
Haomai Wang [Sat, 6 Dec 2014 18:51:47 +0000 (02:51 +0800)]
test/msgr/test_msgr: Fix potential unsafe cond wakeup and wrap check

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agomessages/MClientCaps: init peer.flags 3205/head
Sage Weil [Thu, 18 Dec 2014 14:29:40 +0000 (06:29 -0800)]
messages/MClientCaps: init peer.flags

*** CID 1258789:  Uninitialized scalar field  (UNINIT_CTOR)
/messages/MClientCaps.h: 132 in MClientCaps::MClientCaps(int, inodeno_t,
inodeno_t, unsigned long, int, unsigned int)()
126         head.ino = ino;
127         head.realm = realm;
128         head.cap_id = id;
129         head.migrate_seq = mseq;
130         peer.cap_id = 0;
131         inline_version = 0;
>>>     CID 1258789:  Uninitialized scalar field  (UNINIT_CTOR)
>>>     Non-static class member field "peer.flags" is not initialized in this
constructor nor in any functions that it calls.
132       }
133     private:
134       ~MClientCaps() {}
135
136     public:
137       const char *get_type_name() const { return "Cfcap";}

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: fix leaked OSDMap 3204/head
Sage Weil [Thu, 18 Dec 2014 14:24:49 +0000 (06:24 -0800)]
osd: fix leaked OSDMap

*** CID 1258787:  Resource leak  (RESOURCE_LEAK)
/osd/OSD.cc: 6118 in OSD::handle_osd_map(MOSDMap *)()
6112                    << dendl;
6113            clog->warn() << "failed to encode map e" << e << " with expecte
crc\n";
6114            MMonGetOSDMap *req = new MMonGetOSDMap;
6115            req->request_full(e, last);
6116            monc->send_mon_message(req);
6117            last = e - 1;
>>>     CID 1258787:  Resource leak  (RESOURCE_LEAK)
>>>     Variable "o" going out of scope leaks the storage it points to.
6118            break;
6119           }
6120
6121
6122           hobject_t fulloid = get_osdmap_pobject_name(e);
6123           t.write(META_COLL, fulloid, 0, fbl.length(), fbl);

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMessenger: Create an Messenger implementation by name.
Haomai Wang [Sat, 6 Dec 2014 18:14:46 +0000 (02:14 +0800)]
Messenger: Create an Messenger implementation by name.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #3202 from ceph/wip-fix-asok
Yan, Zheng [Thu, 18 Dec 2014 12:22:40 +0000 (20:22 +0800)]
Merge pull request #3202 from ceph/wip-fix-asok

mds: fix asok on rank 0

10 years agomds: fix asok on rank 0 3202/head
John Spray [Thu, 18 Dec 2014 12:14:25 +0000 (12:14 +0000)]
mds: fix asok on rank 0

Broken by:
1b2b34431 (MDS: do not allow invocation of most commands on an inactive MDS)

MDS::whoami is a rank, so check for inactive is <0, not <=0

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agodoc: Adds updated man page for ceph under man/ 3201/head
Nilamdyuti Goswami [Thu, 18 Dec 2014 11:43:27 +0000 (17:13 +0530)]
doc: Adds updated man page for ceph under man/

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Changes format style in ceph to improve readability as html.
Nilamdyuti Goswami [Thu, 18 Dec 2014 11:41:22 +0000 (17:11 +0530)]
doc: Changes format style in ceph to improve readability as html.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Adds updated man page for ceph-disk under man/ 3193/head
Nilamdyuti Goswami [Thu, 18 Dec 2014 11:20:22 +0000 (16:50 +0530)]
doc: Adds updated man page for ceph-disk under man/

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates man page for ceph-disk with suggested changes.
Nilamdyuti Goswami [Thu, 18 Dec 2014 11:18:50 +0000 (16:48 +0530)]
doc: Updates man page for ceph-disk with suggested changes.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Adds updated man page for ceph-disk under man/
Nilamdyuti Goswami [Wed, 17 Dec 2014 14:41:54 +0000 (20:11 +0530)]
doc: Adds updated man page for ceph-disk under man/

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates man page for ceph-disk.
Nilamdyuti Goswami [Wed, 17 Dec 2014 14:38:22 +0000 (20:08 +0530)]
doc: Updates man page for ceph-disk.

Changes format style to improve readability as html.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Show how new data pools can be added to CephFS for file layouts
Wido den Hollander [Thu, 18 Dec 2014 09:59:31 +0000 (10:59 +0100)]
doc: Show how new data pools can be added to CephFS for file layouts

10 years agopackaging: package ceph-deploy(8) 3195/head
Nilamdyuti Goswami [Thu, 18 Dec 2014 09:02:05 +0000 (14:32 +0530)]
packaging: package ceph-deploy(8)

Fixes merge conflict.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Adds updated man page for ceph-deploy under man/
Nilamdyuti Goswami [Wed, 17 Dec 2014 15:17:22 +0000 (20:47 +0530)]
doc: Adds updated man page for ceph-deploy under man/

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates man page for ceph-deploy.
Nilamdyuti Goswami [Wed, 17 Dec 2014 15:14:52 +0000 (20:44 +0530)]
doc: Updates man page for ceph-deploy.

Changes format style in ceph-deploy to improve readability as html.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoqa: test zero size xattr 3199/head
Yan, Zheng [Thu, 18 Dec 2014 06:43:14 +0000 (14:43 +0800)]
qa: test zero size xattr

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #3198 from ceph/wip-10335
Yan, Zheng [Thu, 18 Dec 2014 02:32:31 +0000 (10:32 +0800)]
Merge pull request #3198 from ceph/wip-10335

MDS: do not allow invocation of most commands on an inactive MDS

10 years agoceph_objectstore_tool: Rename generated binary to ceph-objectstore-tool 3207/head
David Zafman [Wed, 17 Dec 2014 01:02:56 +0000 (17:02 -0800)]
ceph_objectstore_tool: Rename generated binary to ceph-objectstore-tool

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoMDS: do not allow invocation of most commands on an inactive MDS 3198/head
Greg Farnum [Wed, 17 Dec 2014 23:32:23 +0000 (15:32 -0800)]
MDS: do not allow invocation of most commands on an inactive MDS

They just cause all kinds of trouble!

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #2836 from ceph/wip-7317
Gregory Farnum [Wed, 17 Dec 2014 22:12:51 +0000 (14:12 -0800)]
Merge pull request #2836 from ceph/wip-7317

#7317 ENOSPC and OSD epoch barrier handling

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #3197 from ktdreyer/rpm-spec-comment
Loic Dachary [Wed, 17 Dec 2014 21:00:53 +0000 (22:00 +0100)]
Merge pull request #3197 from ktdreyer/rpm-spec-comment

ceph.spec.in: quote %files macro in comment

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph.spec.in: quote %files macro in comment 3197/head
Ken Dreyer [Wed, 17 Dec 2014 20:05:21 +0000 (13:05 -0700)]
ceph.spec.in: quote %files macro in comment

Prior to this commit, RPM would expand the %files macro that was present
in the comment.

Use a double percent sign to quote the macro so that RPM will not expand
it.

This fixes an rpmlint warning, "W: macro-in-comment %files"

More information from rpmlint's "-I" (help) command:

  $ rpmlint -I macro-in-comment
  macro-in-comment:
  There is a unescaped macro after a shell style comment in the
  specfile.  Macros are expanded everywhere, so check if it can cause a
  problem in this case and escape the macro with another leading % if
  appropriate.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #3171 from tchaikov/refactor-rados-class
Loic Dachary [Wed, 17 Dec 2014 18:32:34 +0000 (19:32 +0100)]
Merge pull request #3171 from tchaikov/refactor-rados-class

python-rados: refactor class Rados a little bit

Reviewed-by: Josh During <jdurgin@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agopython-rados: refactor class Rados a little bit 3171/head
Kefu Chai [Sat, 13 Dec 2014 03:30:26 +0000 (11:30 +0800)]
python-rados: refactor class Rados a little bit

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
10 years agopybind/cephfs: Fix setxattr function. Pass value as character pointer
Wido den Hollander [Wed, 17 Dec 2014 13:01:44 +0000 (14:01 +0100)]
pybind/cephfs: Fix setxattr function. Pass value as character pointer

This passes the value of the xattr correctly and makes it work.

10 years agoMerge pull request #3190 from dachary/wip-test-helpers
Loic Dachary [Wed, 17 Dec 2014 08:00:42 +0000 (09:00 +0100)]
Merge pull request #3190 from dachary/wip-test-helpers

tests: ignore xmlstarlet extra empty lines

10 years agotests: ignore xmlstarlet extra empty lines 3190/head
Loic Dachary [Wed, 17 Dec 2014 06:57:34 +0000 (07:57 +0100)]
tests: ignore xmlstarlet extra empty lines

With xmlstarlet 1.3.0 (which is on Ubuntu precise)

xmlstarlet sel -t -m '//pg_stat/state[(contains(.,'\''active'\'') and
contains(.,'\''clean'\'') and not(contains(.,'\''stale'\'')))]' -v . -n

will output an extra empty line which does not show on xmlstarlet
1.5.0 (which is on Ubuntu trusty and Fedora 20).

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoos/FileStore: better debug on omap_setkeys 2976/head
Sage Weil [Sun, 7 Dec 2014 17:02:04 +0000 (09:02 -0800)]
os/FileStore: better debug on omap_setkeys

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/FileStore: better debug on unlink
Sage Weil [Sun, 7 Dec 2014 17:01:00 +0000 (09:01 -0800)]
os/FileStore: better debug on unlink

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/MemStore: drop support for collection attrs
Sage Weil [Fri, 5 Dec 2014 21:59:18 +0000 (13:59 -0800)]
os/MemStore: drop support for collection attrs

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/ObjectStore: deprecated collection_getattr et al
Sage Weil [Fri, 5 Dec 2014 21:58:48 +0000 (13:58 -0800)]
os/ObjectStore: deprecated collection_getattr et al

Drop the functional tests for this too.

Return EOPNOTSUPP by default, and tolerate this in the callers.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph_test_objectstore_workloadgen: set pgmeta omap instead of collection xattr
Sage Weil [Fri, 5 Dec 2014 21:52:42 +0000 (13:52 -0800)]
ceph_test_objectstore_workloadgen: set pgmeta omap instead of collection xattr

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/PG: drop PG/collection attrs from ScrubMap
Sage Weil [Fri, 5 Dec 2014 21:43:52 +0000 (13:43 -0800)]
osd/PG: drop PG/collection attrs from ScrubMap

The collection attrs are often version specific.  We should compare the
semantic PG metadata, if anything, not these!

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/ObjectStore: deprecated collection attr operations
Sage Weil [Fri, 5 Dec 2014 21:38:10 +0000 (13:38 -0800)]
os/ObjectStore: deprecated collection attr operations

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/PG: drop PG::read_info support for ancient PGs
Sage Weil [Fri, 5 Dec 2014 18:57:09 +0000 (10:57 -0800)]
osd/PG: drop PG::read_info support for ancient PGs

This is rewritten regularly by any vaguely-active OSD; no need for this
any more.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: drop snap_collections
Sage Weil [Fri, 5 Dec 2014 17:39:49 +0000 (09:39 -0800)]
osd: drop snap_collections

This is obsolete since cuttlefish.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: drop infos_oid arg from PG::read_info()
Sage Weil [Fri, 5 Dec 2014 01:26:37 +0000 (17:26 -0800)]
osd: drop infos_oid arg from PG::read_info()

Only needed for legacy.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: drop legacy arg to PG::peek_map_epoch
Sage Weil [Fri, 5 Dec 2014 01:25:38 +0000 (17:25 -0800)]
osd: drop legacy arg to PG::peek_map_epoch

The function can figure it out itself, and it's only needed for legacy.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph_objectstore_tool: use '_remove' pgmeta omap key to indicate removal too
Sage Weil [Fri, 5 Dec 2014 01:15:29 +0000 (17:15 -0800)]
ceph_objectstore_tool: use '_remove' pgmeta omap key to indicate removal too

We could conceivably mark the PG for backfill, but to do this correctly
we have to do the log rollback, which uses various methods in PG to update
snap metadata that we simply don't have access to from this tool.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: move pg removal flag into a static helper
Sage Weil [Fri, 5 Dec 2014 01:07:32 +0000 (17:07 -0800)]
osd: move pg removal flag into a static helper

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph_objectstore_tool: Prevent tool from transitioning struct_v on rm-past-intervals
David Zafman [Wed, 26 Nov 2014 00:56:19 +0000 (16:56 -0800)]
ceph_objectstore_tool: Prevent tool from transitioning struct_v on rm-past-intervals

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph_objectstore_tool: Clean-up unused struct_ver in tool's metadata section
David Zafman [Wed, 26 Nov 2014 00:28:25 +0000 (16:28 -0800)]
ceph_objectstore_tool: Clean-up unused struct_ver in tool's metadata section

Exported struct_ver not used by write_info() or write_pg()

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoosd: retire meta/infos object entirely
Sage Weil [Mon, 24 Nov 2014 21:31:31 +0000 (13:31 -0800)]
osd: retire meta/infos object entirely

Do not create it; remove it on upgrade.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: prevent upgrade from older than v7
Sage Weil [Mon, 24 Nov 2014 04:27:08 +0000 (20:27 -0800)]
osd: prevent upgrade from older than v7

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/PGLog: drop support for ancient logs
Sage Weil [Sun, 23 Nov 2014 22:18:17 +0000 (14:18 -0800)]
osd/PGLog: drop support for ancient logs

Assume that users have at least upgraded to dumpling first.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agotest/osd/osd-test-helper.sh: enable filestore log
Sage Weil [Sun, 23 Nov 2014 06:23:32 +0000 (22:23 -0800)]
test/osd/osd-test-helper.sh: enable filestore log

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: move pg log and info to a per-pg object
Sage Weil [Thu, 20 Nov 2014 22:43:37 +0000 (14:43 -0800)]
osd: move pg log and info to a per-pg object

Move all PG metadata (info, biginfo, epoch, and log) to a single per-PG
object.  This should make it easier for ObjectStore implementations to
avoid lock contention in the write path.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/PGLog: explicitly pass log_oid collection
Sage Weil [Thu, 20 Nov 2014 22:02:32 +0000 (14:02 -0800)]
osd/PGLog: explicitly pass log_oid collection

Do not assume the log_oid is ine the 'meta' collection.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/PGLog: take ghobject_t instead of hobject_t
Sage Weil [Thu, 20 Nov 2014 21:20:53 +0000 (13:20 -0800)]
osd/PGLog: take ghobject_t instead of hobject_t

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: move PG collection creation into static PG method
Sage Weil [Thu, 20 Nov 2014 19:35:49 +0000 (11:35 -0800)]
osd: move PG collection creation into static PG method

This way we properly create the pgmeta object and set the infokey attr on
it.  Break it into two steps, one part before split, one after.

Disable the collection_empty() check in split so that it doesn't trip over
this object.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: don't need to pass object names via ctor
Sage Weil [Thu, 20 Nov 2014 00:12:28 +0000 (16:12 -0800)]
osd: don't need to pass object names via ctor

Calculate biginfo on the fly.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/PG: define pgmeta_oid member
Sage Weil [Thu, 20 Nov 2014 00:01:20 +0000 (16:01 -0800)]
osd/PG: define pgmeta_oid member

Signed-off-by: Sage Weil <sage@redhat.com>