Jason Dillaman
fae456f60c
Merge pull request #20420 from trociny/wip-unwatch-race
...
librbd: potential race in RewatchRequest when resetting watch_handle
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-02-20 10:31:54 -05:00
Jason Dillaman
0da7e351a5
Merge pull request #20478 from trociny/wip-api-mirror
...
librbd: fix structure size check in rbd_mirror_image_get_info/status
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-02-20 10:31:14 -05:00
Mykola Golub
c6d9ae9416
Merge pull request #20491 from dillaman/wip-23043
...
qa/workunits/rbd: fix issues within permissions test
Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-02-20 14:39:17 +02:00
Mykola Golub
6f6d21092a
Merge pull request #20481 from dillaman/wip-rbd-remove-error
...
rbd: don't overwrite the error code from the remove action
Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-02-20 14:35:23 +02:00
Mykola Golub
f4cd2772e1
Merge pull request #20486 from dillaman/wip-11502
...
test/librbd: utilize unique pool for cache tier testing
Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-02-20 14:34:45 +02:00
David Zafman
648a4c3d47
Merge pull request #20450 from dzafman/wip-22996
...
Snapset inconsistency is detected with its own error
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-02-19 22:43:02 -08:00
Alfredo Deza
379897e894
Merge pull request #20492 from tchaikov/wip-boost-cmake-3.0
...
cmake: disable DOWNLOAD_NO_PROGRESS if cmake ver is lower than 3.1
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2018-02-19 18:09:12 -05:00
Kefu Chai
d051bf0441
cmake: disable DOWNLOAD_NO_PROGRESS if cmake ver is lower than 3.1
...
see https://cmake.org/cmake/help/v3.1/module/ExternalProject.html and
https://cmake.org/cmake/help/v3.0/module/ExternalProject.html . the
former has DOWNLOAD_NO_PROGRESS, while the latter does not.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-02-20 06:40:15 +08:00
Jason Dillaman
1374acdf1a
qa/workunits/rbd: correct permission test handling for clone v2 images
...
Fixes: http://tracker.ceph.com/issues/23043
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-02-19 15:16:40 -05:00
Jason Dillaman
7b9161eb05
qa/workunits/rbd: utilize RBD profiles in permissions.sh test case
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-02-19 14:53:27 -05:00
Jason Dillaman
c42c54d0ec
test/librbd: utilize unique pool for cache tier testing
...
Fixes: http://tracker.ceph.com/issues/11502
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-02-19 10:25:15 -05:00
Jason Dillaman
11c1a0784c
rbd: don't overwrite the error code from the remove action
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-02-19 09:35:31 -05:00
Mykola Golub
01a2719549
librbd: fix structure size check in rbd_mirror_image_get_info/status
...
Signed-off-by: Mykola Golub <mgolub@suse.com>
2018-02-19 12:31:10 +02:00
Kefu Chai
1b3d19a46b
Merge pull request #20031 from tchaikov/wip-doc-macos
...
doc/dev/macos: add doc for building on MacOS
2018-02-19 15:21:50 +08:00
Kefu Chai
3b10d16235
Merge pull request #20474 from wjwithagen/wjw-wip-pthread_set_name_2
...
include: compat.h, fix the return result of pthread_set_name()
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-19 10:45:31 +08:00
Patrick Donnelly
039165276e
Merge PR #20168 into master
...
* refs/pull/20168/head:
Handle dir->dentries.empty()
client: lookup_ino when i1 becomes NULL
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-02-18 10:36:34 -08:00
Patrick Donnelly
14da9d77b1
Merge PR #20424 into master
...
* refs/pull/20424/head:
qa: ignore io pause warnings in mds-full test
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-18 10:36:30 -08:00
Patrick Donnelly
81d0a52a2a
Merge PR #20428 into master
...
* refs/pull/20428/head:
qa: ignore MON_DOWN while thrashing mons
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-18 10:36:25 -08:00
Patrick Donnelly
852b8491e8
Merge PR #20470 into master
...
* refs/pull/20470/head:
qa: ignore full cluster warnings for mds-full
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-18 10:36:21 -08:00
Willem Jan Withagen
23074ce4a7
include: compat.h, fix the return result of pthread_set_name()
...
On FreeBSD the function type is void(). Make it compatible with return
value on other platforms.
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2018-02-18 14:45:56 +01:00
Patrick Donnelly
27b6bfbd81
qa: ignore full cluster warnings for mds-full
...
Fixes: http://tracker.ceph.com/issues/23033
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-17 16:09:57 -08:00
Kefu Chai
483f14cd80
Merge pull request #20274 from adamemerson/wip-socket-to-me!
...
common/admin_socket: various cleanups
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-17 10:05:08 +08:00
Adam C. Emerson
4914607e7a
common/admin_socket: Use unique_ptr instead of new/delete
...
Mostly for the default hooks, plus one Formatter.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-02-16 14:31:35 -05:00
Adam C. Emerson
5f7a0f5f74
common/admin_socket: Cleanup path cleanup
...
Don't use strdup/free explicitly.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-02-16 14:31:35 -05:00
Adam C. Emerson
1328166ddd
config/admin_socket: Remove PFL_* stuff since nobody's using it
...
If we want to, we have other ways of getting data out of a thread.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-02-16 14:31:35 -05:00
Adam C. Emerson
d26916b476
common/admin_socket: Use one map instead of three
...
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-02-16 14:31:31 -05:00
Adam C. Emerson
c47d3dea85
common/admin_socket: Use std::mutex/condition_variable/thread
...
And fix a bug where we exit in one code-path without releasing the
lock.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-02-16 13:37:12 -05:00
Adam C. Emerson
6e98d33ce7
common: Add make_named_thread
...
To allow us to make a std::thread with a name.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-02-16 12:41:41 -05:00
Adam C. Emerson
bc9ab73704
common/admin_socket: Copy fewer strings
...
Pass std::string_view to call, rather than passing strings by value.
Change cmdmap_t and the maps in admin_socket to use the std::less<>
transparent comparator, so we can compare string_views to strings. (Or
anything else with an equality operator with strings.)
Pass the cmdmap_t in to call by const reference, not reference.
The change to cmdmap_t requires changing some of the users of
cmdmap_t. (That is, make them actually use cmdmap_t explicitly, not
the open-coed map type.)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-02-16 12:41:41 -05:00
Casey Bodley
94922266ce
Merge pull request #17020 from theanalyst/lc-time-disable
...
qa: re enable LC tests
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2018-02-16 12:01:18 -05:00
Casey Bodley
35355d9dc3
Merge pull request #16757 from rzarzynski/wip-rgw-20883
...
rgw: dump Last-Modified in Swift's responses for GET/HEAD on container.
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
2018-02-16 11:59:12 -05:00
Casey Bodley
c2da56cd92
Merge pull request #15054 from rzarzynski/wip-rgw-fix-browser-upload-error-handling
...
rgw: fix error handling in Browser Uploads.
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2018-02-16 11:42:14 -05:00
Yuri Weinstein
df684a4e8c
Merge pull request #12427 from linuxbox2/wip-rgw-ldap-shutdown
...
rgw: don't leak S3 LDAPHelper
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2018-02-16 08:36:58 -08:00
Yuri Weinstein
29b3cee712
Merge pull request #19065 from tianshan/fix_nfs_init
...
rgw: fix RGWLibIO did not init RGWEnv
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
2018-02-16 08:34:45 -08:00
Yuri Weinstein
2bdcc87d2e
Merge pull request #17094 from theanalyst/rgw-policy-tagging-2
...
rgw: add support for tagging and other conditionals in policy
Reviewed-by: Jesse Williamson <jwilliamson@suse.de>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Adam Emerson <aemerson@redhat.com>
2018-02-16 08:33:50 -08:00
Yuri Weinstein
28f6921ea9
Merge pull request #20226 from fangyuxiangGL/offset
...
rgw: can't download object with range when compression enabled
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
2018-02-16 08:31:47 -08:00
Yuri Weinstein
021299081c
Merge pull request #20332 from pritha-srivastava/wip-rgw-role-admin-only
...
rgw: Correct permission evaluation to allow only admin users to work with Roles.
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Adam Emerson <aemerson@redhat.com>
2018-02-16 08:31:08 -08:00
Yuri Weinstein
191ab13bdd
Merge pull request #20396 from tianshan/cancel_op_miss_update_header
...
rgw: fix index cancel op miss update header
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-02-16 08:30:37 -08:00
Alfredo Deza
08f768654b
Merge pull request #20459 from ceph/wip-cv-lint-fix
...
ceph-volume tests remove unused import
Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
2018-02-16 07:03:14 -05:00
Alfredo Deza
ad49283b2e
ceph-volume tests remove unused import
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-02-16 06:51:12 -05:00
Adam C. Emerson
e271ad9c78
buffer: Append from std::string_view
...
Now that we have std::string_view.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-02-15 22:57:20 -05:00
Kefu Chai
cc4f3bd4a3
Merge pull request #20426 from batrick/i22991
...
mon/MgrStatMonitor: fix formatting of pending_digest
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-16 11:27:10 +08:00
Kefu Chai
d4c7b932a7
Merge pull request #20409 from badone/wip-better-error-reporting-ceph_test_admin_socket_output
...
test/admin_socket_output: better error reporting
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-16 11:26:21 +08:00
Kefu Chai
5d8391c6ad
Merge pull request #20370 from ovh/bp-no-normalizing-of-normalized
...
common/ConfUtils: check key before actually normalizing
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-16 11:25:43 +08:00
Kefu Chai
a6c97c3ffc
Merge pull request #20437 from tchaikov/wip-admin-socket
...
common/admin_socket: validate command json before feeding it to hook
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2018-02-16 11:01:46 +08:00
Andrew Schoen
9bc0b8b985
Merge pull request #20408 from ceph/wip-rm22785
...
ceph-volume consume mount/format options from ceph.conf
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2018-02-15 21:08:38 +01:00
Kefu Chai
21fdfc25a2
common/admin_socket: consolidate dump_cmd_to_json() and validate_cmd()
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-02-16 03:51:12 +08:00
Kefu Chai
90ea4b91e4
common/admin_socket: validate command json before feeding it to hook
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-02-16 03:51:12 +08:00
Orit Wasserman
82ea1b5c6b
Merge pull request #20158 from liaoxin01/fix-list-multi-upload
...
rgw: fix the max-uploads parameter not work
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2018-02-15 21:28:32 +02:00
Kefu Chai
097e2de5f7
Merge pull request #20362 from tchaikov/wip-mgr-py3
...
mgr: fix py3 support
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
2018-02-16 02:32:04 +08:00