RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-12 14:10:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,635 Commits 2 Branches 394 Tags 1.3 GiB
e44d1e07a7
Commit Graph

44635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mykola Golub
6907778d76 ceph-objectstore-tool: add mark-complete operation 
It is supposed to be used as a last resort to fix a cluster that has
PGs in 'incomplete' state, using the following procedure:

1) stop the osd that is primary for the incomplete PG;
2) run:
  ceph-objectstore-tool --data-path ... --journal-path ... --pgid $PGID --op mark-complete
3) start the osd.

Fixes: #10098
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2015-09-10 09:01:30 +03:00
Josh Durgin
903983a11a Merge pull request #5816 from dillaman/wip-librbd-gmock 
Initial support for gmock-based unit tests in librbd

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-09-10 01:47:07 -04:00
Sage Weil
a1941026f0 Merge pull request #5557 from guangyy/wip-12666 
rgw: expose the number of unhealthy workers through admin socket

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-09-09 22:16:09 -04:00
Josh Durgin
8218fd1485 Merge pull request #5786 from ceph/wip-12911 
rbd export-diff should export data chunks in-order

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-09-09 21:18:07 -04:00
Loic Dachary
6e0d93cc6d Merge pull request #5858 from jecluis/wip-test-mon-scrub 
test: mon/mon-scrub.sh: have test running on make check

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-09-10 02:55:55 +02:00
Yehuda Sadeh
06147dda2c rgw: preserve all attrs if intra-zone copy 
Fixes: #13015
Intra zone copy requires that all objects' attributes are preserved.
This was broken at commit: e41d97c8e3

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-09-09 15:43:55 -07:00
Sage Weil
f74c60f429 Merge pull request #5442 from ceph/wip-12551 
ReplicatedPG,Objecter: copy_get should include truncate_seq and size

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-09-09 16:21:07 -04:00
Yehuda Sadeh
6c7265a67c Merge pull request #5490 from dwj192/master 
rgw:add --reset-regions for regionmap update

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-09-09 11:38:24 -07:00
Joao Eduardo Luis
293d12a2bc test/Makefile.am: run mon/mon-scrub.sh as part of checks 
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
 2015-09-09 18:17:48 +01:00
Joao Eduardo Luis
6ceb37d4ba test: mon/mon-scrub.sh: port clashed with other tests 
This will allow the test to be run during make check.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
 2015-09-09 18:17:48 +01:00
Yehuda Sadeh
dbf8f67e69 Merge pull request #5828 from lebauce/fix-swift-prefix 
rgw: add delimiter to prefix only when path is specified

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2015-09-09 08:33:59 -07:00
Danny Al-Gaaf
897f074969 test_async_compressor.cc: prefer ++operator for non-primitive iterators 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2015-09-09 15:36:44 +02:00
Danny Al-Gaaf
9d9b305981 os/KeyValueStore.cc: prefer ++operator for non-primitive iterators 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2015-09-09 15:36:44 +02:00
Danny Al-Gaaf
8810f8f2b8 SnappyCompressor.h: prefer ++operator for non-primitive iterators 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2015-09-09 15:36:44 +02:00
Danny Al-Gaaf
4f98dab99c client/Client.cc: fix realloc memory leak 
Fix handling of realloc. If realloc() fails it returns NULL, assigning
the return value of realloc() directly to the pointer without checking
for the result will lead to a memory leak.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2015-09-09 15:36:44 +02:00
Samuel Just
6f9ee7961e ReplicatedPG,Objecter: copy_get should include truncate_seq and size 
Otherwise, we break CephFS over cache tiers.

Fixes: #12551
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-09-09 08:01:59 -04:00
Loic Dachary
384d7f4c3c Merge pull request #5837 from tchaikov/wip-12968 
mon: disable gmt_hitset if not supported

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-09-09 13:06:47 +02:00
Kefu Chai
cdca05feb0 Merge pull request #5842 from dzafman/wip-cot-failure 
test: Fix failure test to find message anywhere in stderr

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-09-09 18:12:30 +08:00
Jianpeng Ma
797caae1f4 test/librados: add test case for read object (off=0,len=0). 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-09-09 16:26:14 +08:00
Jianpeng Ma
19a210a0e7 osd: make read(off=0,len=0) ec-object work. 
When len=0, it mean read the whole object. It can work when reading
no-ec object off=0 & len=0. But for ec-object, it can't work.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-09-09 16:26:14 +08:00
Haomai Wang
ae5e961e9d Merge pull request #5845 from wonzhq/async-rx 
AsyncMessenger: add instance name in debug log when processing msg

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
 2015-09-09 15:20:01 +08:00
Loic Dachary
ddb5301e7e Merge pull request #5779 from dzafman/wip-misc-fix-guangyy 
osd: check the length of the map before accessing the first element

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-09-09 09:00:41 +02:00
Josh Durgin
f95174260d Merge pull request #5843 from dillaman/wip-12885 
librbd: diff_iterate needs to handle holes in parent images

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-09-09 02:55:44 -04:00
Josh Durgin
714a091e1a Merge pull request #5592 from xinxinsh/wip-fix-rbd-metadata 
fix bugs of rbd metadata operation

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-09-09 02:54:45 -04:00
David Zafman
95bd3c2c54 test: Fix failure test to find message anywhere in stderr 
Consolidate test_failure() and test_failure_tty()

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-09-08 23:44:39 -07:00
David Zafman
b968fb3bce rados: Fix usage for "notify" command 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-09-08 23:44:39 -07:00
Kefu Chai
3868939fbd Merge pull request #5834 from ceph/wip-leveldb-hang 
mon: MonitorDBStore: make get_next_key() work properly

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-09-09 12:46:03 +08:00
Kefu Chai
8e8d529fb3 Merge pull request #4955 from kylinstorage/librados-2read-segmentation-fault-v1 
bug fix: librados segmentation fault, when two read ops share one Aio…

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-09-09 12:45:01 +08:00
Kefu Chai
915fd2c9a3 Merge pull request #4925 from XinzeChi/wip-hit-set-size 
osd: fix hit_set_map size for tier pool

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-09-09 12:44:21 +08:00
Kefu Chai
61c7ac1c2b Merge pull request #5723 from H3C/wip-msg-bugfix1 
msg: we should set the socket options before connect or listen in order to have it take effect.

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-09-09 12:43:28 +08:00
Kefu Chai
120bd680c3 Merge pull request #5829 from dachary/wip-12731-jerasure-warnings 
erasure-code: fix gf-complete warnings

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-09-09 12:41:58 +08:00
Zhiqiang Wang
d74135231c AsyncMessenger: add instance name in debug log when processing msg 
To better debug.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
 2015-09-09 11:40:48 +08:00
dwj192
95685c19d6 rgw:add --reset-regions for regionmap update 
Fixes: #12964

Signed-off-by: Weijun Duan <duanweijun@h3c.com>
 2015-09-09 09:48:43 +08:00
David Zafman
a05c4c00b4 Merge pull request #5781 from dzafman/wip-eccleanup 
osd, test: Minor clean-up from fast-read and error handling ec changes

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-09-08 18:25:58 -07:00
Jason Dillaman
3ccc3bb4bd librbd: diff_iterate needs to handle holes in parent images 
If a clone's parent image snapshot includes a discarded extent,
this was previously causing an assert failure.  Instead, ignore
any discard holes in the parent image.

Fixes: #12885
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2015-09-08 15:47:37 -04:00
Jason Dillaman
d5650c9cf8 tests: new test case for librbd diff_iterate over discard extents 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2015-09-08 15:45:45 -04:00
Sage Weil
c2293104d2 Merge pull request #5838 from ceph/wip-12861 
qa/workunits/rados/test_alloc_hint.sh: sudo to ls files

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-09-08 14:08:18 -04:00
Sage Weil
a7f1a3ac6c Merge pull request #5396 from XinzeChi/wip-scrub-promote 
bug fix: osd: requeue_scrub when kick_object_context_blocked

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
 2015-09-08 11:41:38 -04:00
Sage Weil
026012fd62 Merge pull request #5772 from yuyuyu101/wip-12912 
AsyncConnection: Close connection when unregistered connection met WAIT
 2015-09-08 11:41:06 -04:00
Yehuda Sadeh
ba0800354e Merge pull request #5733 from cxwshawn/rgw-fix 
rgw: init_rados failed leads to repeated delete

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-09-08 08:39:43 -07:00
Yehuda Sadeh
02eefbf302 Merge pull request #5809 from rzarzynski/wip-rgw_putobj_debug_improvement 
rgw: improve debugs in RGWPutObj and RGWPutObj_ObjStore_SWIFT.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-09-08 08:35:46 -07:00
Orit Wasserman
16adf6c215 Merge pull request #5567 from guce/rgw_check_key_parameter_conflict 
rgw: add key parameter conflict check for radosgw-admin command line.
 2015-09-08 17:33:13 +02:00
Yehuda Sadeh
ce9fd79881 Merge pull request #5819 from rzarzynski/wip-12950 
rgw: don't append empty ETag HTTP header.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-09-08 08:17:24 -07:00
Sage Weil
c979130755 Merge remote-tracking branch 'gh/infernalis' 2015-09-08 11:02:54 -04:00
Kefu Chai
d32a3be1a6 qa/workunits/rados/test_alloc_hint.sh: sudo to ls files 
The osd data dir is owned by ceph and not readable by other
non-root users.

Fixes: #12861
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2015-09-08 20:50:36 +08:00
Loic Dachary
49ee455b35 Merge pull request #5257 from t-miyamae/wip-mshec-fixlogic4 
erasure code: shec performance optimization by decoding cache

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-09-08 13:52:05 +02:00
Xiaowei Chen
ab4232baa7 rgw: init_rados failed leads to repeated delete 
Fixes: #12978

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
 2015-09-08 06:59:00 -04:00
Kefu Chai
ef9283ae90 Merge pull request #5463 from kylinstorage/wip-evict_ops 
Allow evict operations to be throttled

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-09-08 17:29:29 +08:00
Kefu Chai
6cb448daf0 Merge pull request #5745 from ceph/wip-12904 
osd: sparse reads returning invalid extent map

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-09-08 17:27:22 +08:00
Kefu Chai
fb2d4f2139 Merge pull request #5580 from xinxinsh/wip-merge-two-setattr 
merge two continuous OP_SETATTR ops into one OP_SETATTRS

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-09-08 17:26:28 +08:00