RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 00:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,809 Commits 219 Branches 396 Tags 1.3 GiB
71df64519d
Commit Graph

37809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Loic Dachary
71df64519d Merge pull request #3210 from ceph/wip-osdmap 
osd: only verify OSDMap crc if it is known

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2014-12-19 15:07:56 +01:00
Loic Dachary
8c2c48d8d4 Merge pull request #3216 from cstavr/master 
ceph-disk: Fix wrong string formatting

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2014-12-19 14:57:11 +01:00
Christos Stavrakakis
a302c44e9c ceph-disk: Fix wrong string formatting 
Signed-off-by: Christos Stavrakakis <stavr.chris@gmail.com>
 2014-12-19 13:46:44 +02:00
Loic Dachary
af18cf8d61 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>
 2014-12-19 01:54:42 +01:00
Sage Weil
1eb0cd5a14 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>
 2014-12-18 16:49:06 -08:00
Dan Mick
1b7585b310 stop.sh: only try killing processes that belong to me 
Signed-off-by: Dan Mick <dan.mick@redhat.com>
 2014-12-18 16:14:43 -08:00
Loic Dachary
8547d9baae 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>
 2014-12-19 01:12:10 +01:00
Dan Mick
2af416b80f Merge pull request #3208 from ceph/wip-10326 
qa/workunits/rest/test.py: fix pg stat test
 2014-12-18 16:10:34 -08:00
Sage Weil
0af2a1c1cc qa/workunits/rest/test.py: fix pg stat test 
Back in e27b0d9e42 we changed pg stat to
not dump everything when a formatter is used.

Fixes: #10326
Signed-off-by: Sage Weil <sage@redhat.com>
 2014-12-18 15:49:58 -08:00
John Wilkins
3b46995c97 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>
 2014-12-18 15:01:50 -08:00
John Wilkins
3450220be5 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>
 2014-12-18 15:00:37 -08:00
Sage Weil
5439d9ee70 Merge pull request #3057 from ceph/wip-crush-straw 
crush: fix straw bucket scaler bugs

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2014-12-18 14:13:33 -08:00
Sage Weil
2a1bd761e9 .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>
 2014-12-18 14:09:21 -08:00
Sage Weil
e3f370f246 Merge pull request #3101 from yuyuyu101/wip-10147 
Messenger Unit Tests

Reviewed-by: Sage Weil <sage@redhat.com>
 2014-12-18 14:05:16 -08:00
Gregory Farnum
cc504694bf Merge pull request #3205 from ceph/wip-caps-init 
messages/MClientCaps: init peer.flags

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2014-12-18 11:36:49 -08:00
Samuel Just
a2112fd072 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>
 2014-12-18 11:23:23 -08:00
Samuel Just
2474a7854c 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>
 2014-12-18 11:21:28 -08:00
Samuel Just
0a6d5aef16 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>
 2014-12-18 11:20:24 -08:00
Samuel Just
a9aaea7709 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>
 2014-12-18 11:19:34 -08:00
Loic Dachary
916a211aac Merge pull request #3204 from ceph/wip-osdmap-leak 
osd: fix leaked OSDMap

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2014-12-18 19:32:41 +01:00
Haomai Wang
1f9c087421 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>
 2014-12-18 23:36:27 +08:00
Haomai Wang
20ea086722 PipeConnection: Avoid deadlock when calling is_connected 
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
 2014-12-18 22:51:33 +08:00
Haomai Wang
9783a5cb64 test/msgr/test_msgr: Fix potential unsafe cond wakeup and wrap check 
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
 2014-12-18 22:50:57 +08:00
Sage Weil
2cd9dc0804 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>
 2014-12-18 06:29:40 -08:00
Sage Weil
679652ab36 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>
 2014-12-18 06:24:49 -08:00
Haomai Wang
001ea29386 Messenger: Create an Messenger implementation by name. 
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
 2014-12-18 21:51:12 +08:00
Yan, Zheng
2d76bc2d98 Merge pull request #3202 from ceph/wip-fix-asok 
mds: fix asok on rank 0
 2014-12-18 20:22:40 +08:00
John Spray
3a2cb7148a 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>
 2014-12-18 12:16:13 +00:00
Nilamdyuti Goswami
8de9a0f437 doc: Adds updated man page for ceph under man/ 
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
 2014-12-18 17:13:27 +05:30
Nilamdyuti Goswami
8b79617306 doc: Changes format style in ceph to improve readability as html. 
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
 2014-12-18 17:11:22 +05:30
Wido den Hollander
883e1aea96 doc: Show how new data pools can be added to CephFS for file layouts 2014-12-18 10:59:31 +01:00
Nilamdyuti Goswami
2b577cef00 packaging: package ceph-deploy(8) 
Fixes merge conflict.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
 2014-12-18 14:32:05 +05:30
Nilamdyuti Goswami
c664818892 doc: Adds updated man page for ceph-deploy under man/ 
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
 2014-12-18 13:51:46 +05:30
Nilamdyuti Goswami
e638469b58 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>
 2014-12-18 13:51:46 +05:30
Yan, Zheng
bfa4acf26e Merge pull request #3198 from ceph/wip-10335 
MDS: do not allow invocation of most commands on an inactive MDS
 2014-12-18 10:32:31 +08:00
David Zafman
4f72ba545e ceph_objectstore_tool: Rename generated binary to ceph-objectstore-tool 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2014-12-17 17:09:09 -08:00
Greg Farnum
1b2b344313 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>
 2014-12-17 15:32:23 -08:00
Gregory Farnum
be7b2f8a30 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>
 2014-12-17 14:12:51 -08:00
Loic Dachary
65be519b03 Merge pull request #3197 from ktdreyer/rpm-spec-comment 
ceph.spec.in: quote %files macro in comment

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2014-12-17 22:00:53 +01:00
Ken Dreyer
69fa5329ce 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>
 2014-12-17 13:06:58 -07:00
Loic Dachary
38768da1b6 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>
 2014-12-17 19:32:34 +01:00
Kefu Chai
378ebb79d0 python-rados: refactor class Rados a little bit 
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
 2014-12-18 02:05:32 +08:00
Wido den Hollander
0c9d55d404 pybind/cephfs: Fix setxattr function. Pass value as character pointer 
This passes the value of the xattr correctly and makes it work.
 2014-12-17 14:01:44 +01:00
Loic Dachary
9b73c76209 Merge pull request #3190 from dachary/wip-test-helpers 
tests: ignore xmlstarlet extra empty lines
 2014-12-17 09:00:42 +01:00
Loic Dachary
023a8aca8c 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>
 2014-12-17 08:02:17 +01:00
Sage Weil
242e28d13a Merge pull request #2530 from majianpeng/fiemap 
Fiemap

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
 2014-12-16 16:50:45 -08:00
Sage Weil
ca1b216b47 Merge pull request #2137 from yuyuyu101/pg-sparse-recovery 
ReplicatedPG: Make recovery using fiemap and fix perf counter

sage-2014-12-16_08:43:28-powercycle-wip-sage-testing-distro

Reviewed-by: Sage Weil <sage@redhat.com>
 2014-12-16 15:15:02 -08:00
Sage Weil
9323ab29cd Merge pull request #3000 from yuyuyu101/wip-10166 
Wip 10166: fiemap or FileStore::do_sparse_copy_range bug

sage-2014-12-16_08:43:28-powercycle-wip-sage-testing-distr

Reviewed-by: Sage Weil <sage@redhat.com>
 2014-12-16 15:14:20 -08:00
Sage Weil
f8d37a2cc4 Merge remote-tracking branch 'gh/master' into wip-watch-notify 
Conflicts:
	PendingReleaseNotes

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Josh During <jdurgin@redhat.com>
 2014-12-16 14:02:32 -08:00
Samuel Just
868d7496f5 Merge pull request #3033 from dachary/wip-10201-osd-scrub-repair 
osd scrub repair uses ceph_objecstore_tool + shell toolbox

Reviewed-by: Samuel Just <sjust@redhat.com>
 2014-12-16 13:54:11 -08:00