Commit Graph

54238 Commits

Author SHA1 Message Date
Kefu Chai
7696f09590 Merge pull request #9399 from mikulely/update-ceph-deploy-link
doc: update broken link for deploy ceph by Chef

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-06-03 20:36:35 +08:00
Jason Dillaman
197849cd9d Merge pull request #9441 from xinxinsh/wip-16706
librbd: remove invalid object map flag when object map is disabled

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-06-03 08:08:19 -04:00
Jason Dillaman
17dbc1c967 Merge pull request #9437 from x11562/object-map
librbd: add object-map rebuild fail error log

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-06-03 08:02:57 -04:00
John Spray
04f49df63b Merge pull request #8652 from JiYou/fix-cephfs
cephfs: should close file handler before exit in cephfs.cc

Reviewed-by: John Spray <john.spray@redhat.com>
2016-06-03 12:46:03 +01:00
John Spray
5de0b6fb7b Merge pull request #8925 from ukernel/wip-15723
client: fstat should take CEPH_STAT_CAP_INODE_ALL

Reviewed-by: John Spray <john.spray@redhat.com>
2016-06-03 11:50:55 +01:00
John Spray
e63b724209 Merge pull request #9421 from renhwztetecs/renhw-wip-cdir
mds/cdir: limit max snap id in lookup()

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2016-06-03 11:49:56 +01:00
John Spray
8b7d26689c Merge pull request #9418 from xiexingguo/xxg-wip-fix-mdsmonitor
mon/MDSMonitor: fix wrong positive result of jewel flag check

Reviewed-by: John Spray <john.spray@redhat.com>
2016-06-03 11:45:38 +01:00
John Spray
1abccb6967 Merge pull request #8965 from ukernel/wip-lock-starve
mds: finish lock waiters in the same order that they were added.

Reviewed-by: John Spray <john.spray@redhat.com>
2016-06-03 11:43:47 +01:00
John Spray
6ce985f2a1 Merge pull request #8695 from renhwztetecs/renhw-wip-mds-dispatch
mds: dispatch assert cleanup

Reviewed-by: John Spray <john.spray@redhat.com>
2016-06-03 11:41:58 +01:00
Ramesh Chander
7c68bea09d os/bluestore:Tree based bitmapalloc
Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
2016-06-02 23:07:16 -07:00
x11562
d7688d92e5 librbd: object-map rebuild fail, add error information
Signed-off-by: Na Xie <xie.na@h3c.com>
2016-06-03 09:36:39 +08:00
xinxin shu
b2d475686e remove invalid objectmap flag when objectmap is disabled
Fixes: http://tracker.ceph.com/issues/16076
Signed-off-by: xinxin shu <shuxinxin@chinac.com>
2016-06-03 09:28:57 +08:00
weiqiaomiao
3c899704f2 rgw:fix some indentation errors of "radosgw-admin --help"
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
2016-06-03 08:59:58 +08:00
Casey Bodley
375c09c21c Merge pull request #9349 from Adirl/fix_compiltaion_entity_addr_t4
msg: add const overload to entity_addr_t functions

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-06-02 16:03:45 -04:00
Sage Weil
2cd63d2209 os/bluestore: remove aio_zero from BlockDevice interface
No users.  Not needed.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-06-02 14:35:09 -04:00
Matt Benjamin
aff13e590d Merge pull request #9295 from cbodley/wip-rgw-rados-vector
rgw: use vector for librados handles
2016-06-02 13:41:59 -04:00
Sage Weil
b55b6fbfa1 Merge pull request #9454 from tanghaodong25/bluestore-write-path
os/bluestore: no 'head_read' when check ondisk length.

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-02 13:13:12 -04:00
haodong
6f4f28b916 os/bluestore: no 'head_read' when check ondisk length.
Signed-off-by: Haodong Tang <haodong.tang@intel.com>
2016-06-03 00:05:21 +08:00
Sage Weil
f92e8d0762 Merge pull request #9458 from jimwright/master
librados: Added declaration for rados_aio_get_version

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-02 11:46:21 -04:00
Sage Weil
c34342b108 Merge pull request #9462 from athanatos/wip-15952
osd/ReplicatedPG: adjust num_pinned in _delete_oid

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-02 11:45:36 -04:00
Sage Weil
acb567b30f Merge pull request #9236 from athanatos/wip-15943
osd/PG: update PGPool to detect map gaps and reset cached_removed_snaps

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-02 11:44:54 -04:00
Casey Bodley
459d4299f7 Merge pull request #9460 from pritha-srivastava/wip-cmake-vstart
cmake: detection scripts use lowercase project name

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-06-02 11:29:55 -04:00
Pritha
8f20e3cc61 cmake: detection scripts use lowercase project name
Changing the detection scripts to use the new project name, changed in commit
c1a37101ea (cmake: project name should be "ceph")

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
2016-06-02 20:55:40 +05:30
Jason Dillaman
d10ffaafbd test/rbd: fsx needs to shut down the journal
Fixes: http://tracker.ceph.com/issues/16123
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-06-02 10:41:18 -04:00
Jim Wright
a5a1c1732e librados: Added declaration for rados_aio_get_version
Was missing from librados.h and hence had an incorrect
visability.

Fixes: #15535
2016-06-02 15:12:30 +01:00
Sage Weil
c0d84f56cc Merge pull request #9449 from ifed01/wip-bluestore-crc32
os/bluestore: Some improvement for crc32c calculations

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-02 10:06:17 -04:00
Sage Weil
03222ff353 rocksdb: pull up to latest master
This includes our replay fixes, which are now upstream.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-06-02 10:00:56 -04:00
Sage Weil
a2ee2b6ebe Merge pull request #9448 from tchaikov/wip-fix-warning
test/osd/TestRados.cc: silence a compiler warning

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-02 09:57:34 -04:00
Sage Weil
0770791d98 qa/workunits/rados/loadgen-mostly-read.sh: half as much data (512mb)
Use less space so we can run on openstack.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-06-02 09:52:00 -04:00
Yehuda Sadeh
626d795139 rgw: can set negative max_buckets on RGWUserInfo
This can be used to disable user's bucket creation

Fixes: http://tracker.ceph.com/issues/14534

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-06-02 05:50:45 -07:00
Orit Wasserman
cf14492db7 Merge pull request #9037 from rzarzynski/wip-rgw-swift-quota
rgw: add support for account and container quotas of Swift API
Reviewed-by" Orit Wasserman <owasserm@redhat.com>
2016-06-02 14:45:43 +02:00
Igor Fedotov
8d1673809f os/bluestore: dec->hex for verify_csum error reporting
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-06-02 12:21:35 +03:00
Orit Wasserman
e610ad9608 rgw: reuse populate_with_generic_attrs() across rgw_op.cc.Reviewed-by: Orit Wasserman <owasserm@redhat.com>
rgw: reuse populate_with_generic_attrs() across rgw_op.cc.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-06-02 11:20:55 +02:00
Igor Fedotov
d2392b8f54 common/Checksummer: Eliminates data copying in crc32c calculation
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-06-02 12:19:23 +03:00
Orit Wasserman
ae181ddc05 Merge pull request #9367 from Yan-waller/yj-wip-rgwfixhextobuf
rgw/common: fix error return value of hex_to_buf.
Reviewed by: Orit Wasserman <owasserm@redhat.com>
2016-06-02 11:19:05 +02:00
Igor Fedotov
2322ab87fc common/bufferlist: Adds test cases for bufferlist::iterator::crc32c
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-06-02 12:17:47 +03:00
Igor Fedotov
613a2a8280 common/bufferlist: Fixes lack of offset increment in get_ptr_and_advance
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-06-02 12:14:22 +03:00
Sage Weil
414d96608d buffer: add iterator crc32c method
Calculate crc from an iterator position.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-06-02 12:10:22 +03:00
Kefu Chai
922be65fab test/osd/TestRados.cc: silence a compiler warning
fix following warning by returning `nullptr` after an assert(0).
```
ceph/src/test/osd/TestRados.cc: In member function ‘TestOp*
WeightedTestGenerator::gen_op(RadosTestContext&, TestOpType)’:
ceph/src/test/osd/TestRados.cc:241:3: warning: control reaches
end of non-void function [-Wreturn-type]
   }
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-02 17:00:05 +08:00
Kefu Chai
22b7810742 Merge pull request #9438 from ceph/wip-cmake
cmake: rbd_mirror not linking rbd_test_mock

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-06-02 15:41:21 +08:00
Yehuda Sadeh
9661bbbbd7 Merge pull request #9060 from mikulely/fix-rgw-multiste-doc
doc: fix rgw multiste config

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2016-06-02 08:52:42 +03:00
Yehuda Sadeh
2c3def40d3 Merge pull request #9392 from yehudasa/wip-16072
rgw/rgw_common.cc: modify the end check in RGWHTTPArgs::sys_get

Tested-by: Orit Wasserman <owasserm@redhat.com>

http://pulpito.ceph.com/owasserm-2016-06-01_20:43:36-rgw:verify-wip-orit-testing---basic-mira/
2016-06-02 08:46:04 +03:00
Ali Maredia
c8d49d43f4 cmake: rbd_mirror not linking rbd_test_mock
Added rbd_test_mock lib, also changed name of
journal_test to journal_test_mock to mimic
automake naming.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-06-01 23:28:38 -04:00
xie xingguo
0c3a92bb99 mon/MDSMonitor: fix wrongly set expiration time of blacklist
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-02 06:34:18 +08:00
xie xingguo
d75541fd5d mon/MDSMonitor: fix assert
Belowe here "version" will never equal to "fsmap.epoch", otherwise we shall
return already.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-02 06:34:17 +08:00
xie xingguo
02322cdf69 mon/MDSMonitor: drop redundant assignment
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-02 06:34:16 +08:00
Matt Benjamin
e4f55f458d Merge pull request #9209 from yehudasa/wip-15939
rgw: aws4 fixes

verified
2016-06-01 18:11:53 -04:00
Samuel Just
542931f69c Merge pull request #9084 from dzafman/wip-dz-misc
Wip dz misc

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-06-01 14:16:32 -07:00
Casey Bodley
5d8a9b4599 Merge pull request #9426 from linuxbox2/cmake-mds
cmake: change libmds back to a static library

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-06-01 14:07:59 -04:00
Matt Benjamin
4d3753801d cmake: restore static linkage (libmds)
Required by ceph-mds.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-06-01 14:04:46 -04:00