Commit Graph

67937 Commits

Author SHA1 Message Date
John Spray
d4f6385b85 Merge pull request #12800 from jcsp/wip-vstart-qasuite
Improve vstart_runner to (optionally) create its own cluster

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-01-31 02:02:49 +01:00
Jason Dillaman
f56126afe3 Merge pull request #12817 from liupan1111/wip-list-snapshot-time
librbd: support to list snapshot timestamp

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-01-30 18:36:46 -05:00
Josh Durgin
c26f317c7f Merge pull request #13098 from wido/doc-osd-greace
doc: Document that osd_heartbeat_grace applies to MON and OSD

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-01-30 14:55:45 -08:00
Ilya Dryomov
326a11362f Merge pull request #13141 from dillaman/wip-18653
librbd: introduce new constants for tracking max block name prefix

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2017-01-30 22:33:25 +01:00
Jason Dillaman
2c08629c99 librbd: introduce new constants for tracking max block name prefix
Fixes: http://tracker.ceph.com/issues/18653
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-01-30 15:25:23 -05:00
Sage Weil
084f0c1876 Merge pull request #13188 from liewegas/wip-rest-fs-name
qa/workunits/rest: use unique pool names for cephfs test

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-01-30 13:30:05 -06:00
Pan Liu
66992d1931 test: regolden formatted-output.t for timestamp metadata of rbd snapshot
Signed-off-by: Pan Liu <pan.liu@istuary.com>
2017-01-31 03:22:33 +08:00
Pan Liu
bd4e36632a test: Add unit test for getting rbd snapshot timestamp info
Signed-off-by: Pan Liu <pan.liu@istuary.com>
2017-01-31 03:20:31 +08:00
Pan Liu
9debf5c98a librbd: support to list snapshot time stamp
Fixes: http://tracker.ceph.com/issues/808
Signed-off-by: Pan Liu <pan.liu@istuary.com>
2017-01-31 03:18:32 +08:00
Pan Liu
4dd47b0bac librbd: Add timestamp metadata when creating rbd snapshot
Signed-off-by: Pan Liu <pan.liu@istuary.com>
2017-01-31 03:18:14 +08:00
Yehuda Sadeh
fc9a03ec4f Merge pull request #12646 from SirishaGuduru/swift-api-auth-doc-change
doc: Fixes radosgw-admin ex: in swift auth section

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-01-30 08:36:32 -08:00
Sage Weil
388a7ff8ef qa/workunits/rest: use unique pool names for cephfs test
Using cephfs_[meta]data collides with the pools that teuthology
already creates if an mds is defined.

This became a (noticeable) problem with 052c3d3f68

Signed-off-by: Sage Weil <sage@redhat.com>
2017-01-30 11:14:31 -05:00
Casey Bodley
b4446ac582 Merge pull request #13054 from oritwas/wip-rgw-period-update-crash
rgw: fix period update crash

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-01-30 09:52:13 -05:00
Kefu Chai
e690a1afbf Merge pull request #13186 from Adirl/fix_rdma_compile
cmake: fix broken RDMA compilation after merge PR #12878

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-01-30 20:19:11 +08:00
Radoslaw Zarzynski
034a6f9ba0 Merge pull request #13003 from Jing-Scott/dev/swift-container-acl-info
rgw: swift: the http referer acl in swift API should be shown

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2017-01-30 12:58:56 +01:00
Radoslaw Zarzynski
fca5b3c3ff Merge pull request #13005 from Jing-Scott/dev/swift-http-url-parse
rgw: swift: The http referer should be parsed to compare in swift API

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2017-01-30 12:55:35 +01:00
Radoslaw Zarzynski
b8e7a276f6 Merge pull request #12874 from Jing-Scott/dev/swift-ref
rgw: the swift container acl should support field .ref

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2017-01-30 12:44:21 +01:00
Oren Duer
94a27ecf39 cmake: fix broken RDMA compilation after merge PR #12878
issue: 965984

Change-Id: I2e401acf204069d3907001d276c58d9fb4cd0d58
Signed-off-by: Oren Duer <oren@mellanox.com>
2017-01-30 10:55:26 +00:00
Wido den Hollander
f42afa828b
doc: Document that osd_heartbeat_grace applies to MON and OSD
This value has to be set in both the [mon] and [osd] section since
both daemons read this value.

Signed-off-by: Wido den Hollander <wido@42on.com>
2017-01-30 10:04:52 +01:00
Haomai Wang
d09fded5ae Merge pull request #13142 from Adirl/remove_compilation_warning
msg/async/rdma: Remove compilation warning

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-01-28 15:52:17 +08:00
Sage Weil
496012e206 Merge pull request #13057 from wido/issue-18635
systemd: Restart Mon after 10s in case of failure

Reviewd-by: Loic Dachary <ldachary@redhat.com>
2017-01-27 15:38:24 -06:00
Sage Weil
b88b29ef6e Merge pull request #13140 from liewegas/wip-bluestore-statfs
os/bluestore: fix statfs to not include DB partition in free space

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2017-01-27 15:37:25 -06:00
Sage Weil
166735a0b4 Merge pull request #13135 from liewegas/wip-kerneldevice-debug
os/bluestore/KernelDevice: fix debug message

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2017-01-27 15:37:13 -06:00
John Spray
81e3a9dd9e Merge pull request #13124 from ukernel/wip-18675
client: remove request from session->requests when handling forward

Reviewed-by: John Spray <john.spray@redhat.com>
2017-01-27 17:41:36 +01:00
John Spray
f44795a625 Merge pull request #13095 from ukernel/wip-18660
mds: skip fragment space check for replayed request

Reviewed-by: John Spray <john.spray@redhat.com>
2017-01-27 17:40:46 +01:00
John Spray
b54707ddca Merge pull request #13052 from ukernel/wip-16768
mds: don't modify inode that is not projected

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-01-27 17:39:32 +01:00
John Spray
20db6c6f54 Merge pull request #12973 from ukernel/wip-18578
mds: fix incorrect assertion in Server::_dir_is_nonempty()

Reviewed-by: John Spray <john.spray@redhat.com>
2017-01-27 17:37:31 +01:00
John Spray
48adc77476 Merge pull request #12825 from stiopaa1/r11124_refuseToDoFsNew
mon/MDSMonitor.cc:refuse fs new on pools with obj

Reviewed-by: John Spray <john.spray@redhat.com>
2017-01-27 17:35:38 +01:00
John Spray
954a26534d Merge pull request #12489 from gregsfortytwo/wip-fix-rename-bounds
client: fix the cross-quota rename boundary check conditions

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2017-01-27 17:33:41 +01:00
John Spray
f3c7ab7988 Merge pull request #12440 from runsisi/wip-fix-fp-exception
include/fs_types: fix unsigned integer overflow

Reviewed-by: Sage Weil <sage@redhat.com>
2017-01-27 17:32:49 +01:00
John Spray
5f67cf97f9 Merge pull request #13088 from jcsp/wip-16397-unpin
qa: unpin knfs from ubuntu

Reviewed-by: Jeff Layton <jlayton@redhat.com>
2017-01-27 15:39:41 +01:00
Dan Mick
24abb20695 Merge pull request #13148 from tchaikov/wip-18692
packaging: install libceph-common.so* not libceph-common.so.*

Reviewed-by: Dan Mick <dmick@redhat.com>
2017-01-26 19:43:34 -08:00
Kefu Chai
b641135cf8 packaging: install libceph-common.so* not libceph-common.so.*
Fixes: http://tracker.ceph.com/issues/18692
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-01-27 10:43:42 +08:00
Josh Durgin
fa0311ee52 Merge pull request #13087 from athanatos/wip-17831-18583
osd/PrimaryLogPG::try_lock_for_read: give up if missing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-01-26 15:50:53 -08:00
Josh Durgin
2ebea511ed Merge pull request #12934 from athanatos/wip-18529
test/pybind/test_rados.py: tolerate TimedOut in test_ping_monitor

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-01-26 15:14:45 -08:00
Mykola Golub
c720e348d4 Merge pull request #13110 from dillaman/wip-18666
librbd: prevent self-blacklisting during break lock

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-01-26 23:44:01 +02:00
Marcus Watts
5f229d6a33 radosgw/swift: clean up flush / newline behavior.
The current code emits a newline after swift errors, but fails
to account for it when it calculates 'content-length'.  This results in
some clients (go github.com/ncw/swift) producing complaints about the
unsolicited newline such as this,
	Unsolicited response received on idle HTTP channel starting with "\n"; err=<nil>

This logic eliminates the newline on flush.  This makes the content length
calculation correct and eliminates the stray newline.

There was already existing separator logic in the rgw plain formatter
that can emit a newline at the correct point.  It had been checking
"len" to decide if previous data had been emitted, but that's reset to 0
by flush().  So, this logic adds a new per-instance variable to separately
track state that it emitted a previous item (and should emit a newline).

Fixes: http://tracker.ceph.com/issues/18473
Signed-off-by: Marcus Watts <mwatts@redhat.com>
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2017-01-26 14:58:29 -05:00
Samuel Just
43e677dded test/pybind/test_rados.py: tolerate empty output from mon ping
Fixes: http://tracker.ceph.com/issues/18529
Signed-off-by: Samuel Just <sjust@redhat.com>
2017-01-26 11:46:36 -08:00
Yehuda Sadeh
b6f1ba8a81 Merge pull request #13007 from Werkov/rgw-fix-tempurl-url-encoding-master
rgw: Use decoded URI when verifying TempURL

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2017-01-26 11:34:38 -08:00
Sage Weil
c66d5babb1 os/bluestore: fix statfs to not include DB partition in free space
If we report the DB space as vailable, ceph thinks the OSD can store more
data and will not mark the cluster as full as easily.  And in reality, we
can't actually store data in this space--only metadata.  Avoid the problem
by not reporting it as available.

Fixes: http://tracker.ceph.com/issues/18599
Signed-off-by: Sage Weil <sage@redhat.com>
2017-01-26 14:22:53 -05:00
Sarit Zubakov
187c5cfa31 sync/rdma: Remove warning
Fixed warning - of sending unsigned short int to %x

issue: 944710

Change-Id: I2820e8da77467a4a645d9653b4964e7a2198656b
Signed-off-by: Sarit Zubakov <saritz@mellanox.com>
2017-01-26 21:12:03 +02:00
Yehuda Sadeh
10a7ff0a75 Merge pull request #12444 from oritwas/wip-rgw-fix-secondary_versioning
rgw: complete versioning enablement after sending it to meta master

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-01-26 10:49:41 -08:00
Orit Wasserman
125955e062 rgw: add check for update return value
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2017-01-26 19:45:40 +02:00
Orit Wasserman
5393077e07 rgw: fix init_zg_from_period when default zone is not set as default
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2017-01-26 19:45:40 +02:00
Orit Wasserman
ac9a7565dd rgw: we need to reinit the zonegroup after assignment to avoid invalid cct and store
Fixes: http://tracker.ceph.com/issues/18631
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2017-01-26 19:45:40 +02:00
Sage Weil
05e4aaa830 Merge pull request #13074 from liewegas/wip-bluestore-crc-error
os/bluestore: include logical object offset in crc error

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-01-26 11:21:15 -06:00
Sage Weil
31721ea78c os/bluestore/KernelDevice: fix debug message
Not even sure why this compiles :/.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-01-26 11:02:06 -05:00
Kefu Chai
8a86a3fd85 Merge pull request #12878 from tchaikov/wip-cmake
cmake: link ceph-{mgr,mon,mds,osd} against libcommon statically

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-01-26 23:59:36 +08:00
Kefu Chai
4755086f8f Merge pull request #13122 from orendu/fix-rdma-compilation
cmake: Fix broken async/rdma compilation since move to libceph-common

Reviewed-by: Adir Lev <adirl@mellanox.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Amir Vadai <amir@vadai.me>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-01-26 19:23:09 +08:00
Haomai Wang
8548eda47b Merge pull request #13101 from Adirl/fix_mem_leak
msg/async/rdma: Fix memory leak of OSD

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-01-26 18:25:54 +08:00