Yan, Zheng
9d271696b7
mds: fix check of underwater dentries
...
Underwater dentry is dentry that is dirty in our cache from journal
replay, but had already been flushed to disk before the mds failed.
To decide if an dentry is underwater, original code compares dirty
dentry's version to on-disk dirfrag's version. This method is racy
because CDir::log_mark_dirty() can increase dirfrag's version without
adding log event. After mds failover, version of dirfrag from journal
replay can be less than on-disk dirfrag's version. So newly dirtied
dentry can be equal to or less than the on-disk dirfrag's version.
The race can cause incorrect fragstat/rstat
Fixes: http://tracker.ceph.com/issues/23032
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2018-02-19 11:28:24 +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
Kefu Chai
57d1b785ff
Merge pull request #20430 from tchaikov/wip-bluefs-demotion
...
os/bluestore: fix the demotion in StupidAllocator::init_rm_free
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
2018-02-16 02:26:09 +08:00
David Zafman
00d4c3eef0
Merge pull request #20410 from dzafman/wip-21218
...
osd: Fix assert when checking missing version
Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-15 10:25:44 -08:00
Yuri Weinstein
bd26668ad1
Merge pull request #19322 from theanalyst/usage-trim-2
...
rgw: add an option to clear all usage entries
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-02-15 09:26:06 -08:00
Yuri Weinstein
bb4b98bf07
Merge pull request #19573 from Leeshine/wip-rgw-sync-status
...
rgw: improve sync status
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-02-15 09:25:36 -08:00
Yuri Weinstein
7e6edc0c46
Merge pull request #19606 from cfanz/wip-rgw-fix-collect-return
...
rgw: fix collect()'s return in coroutine
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2018-02-15 09:25:05 -08:00
Yuri Weinstein
fdeb12f6a7
Merge pull request #19815 from qrGitHub/wip-rgw-memory-optimize2
...
rgw: drop unused vector elements
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-02-15 09:24:35 -08:00
Yuri Weinstein
0762dbe9cc
Merge pull request #19921 from fangyuxiangGL/lc-ret
...
rgw: lifecycle omap entry was removed in abnormal situation
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
2018-02-15 09:07:57 -08:00
Yuri Weinstein
04d17acc99
Merge pull request #20006 from jcsp/wip-rgw-perfcounters
...
rgw: set priority on perf counters
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
2018-02-15 09:07:00 -08:00
Yuri Weinstein
350eef5c61
Merge pull request #20021 from tianshan/fix_bilog_list
...
cls/rgw: fix bi_log_iterate_entries return wrong truncated
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-02-15 09:05:10 -08:00
Yuri Weinstein
f4080c4a61
Merge pull request #20023 from badone/wip-rgw-better-ERANGE-error
...
rgw: Better ERANGE error message
Reviewed-by: <mkogan@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
2018-02-15 09:04:48 -08:00
Yuri Weinstein
0eab7516ba
Merge pull request #20024 from luomuyao/dev
...
rgw: fix a typo in rgw_perms[]
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-02-15 09:04:19 -08:00
Yuri Weinstein
327d3bd337
Merge pull request #20191 from yehudasa/wip-22833
...
rgw: sync tracing fixes
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: <mkogan@redhat.com>
2018-02-15 09:02:19 -08:00
Yuri Weinstein
3563d21664
Merge pull request #20063 from cethikdata/rgw_quota
...
rgw: upldate the max-buckets when the quota is uploaded
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-02-15 08:59:00 -08:00
Yuri Weinstein
d881a416e4
Merge pull request #20095 from tianshan/fix_reload
...
rgw: fix RGWCompletionManager get_next stuck after going down
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-02-15 08:58:39 -08:00
Alfredo Deza
287c952bc8
ceph-volume util.prepare extend flags when found
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-02-15 11:29:29 -05:00
Alfredo Deza
457a5173d2
ceph-volume util.constants update mount flags to include rw, normalize on list
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-02-15 11:29:29 -05:00
Alfredo Deza
b80e3bf117
ceph-volume configuration normalize underscore vs. whitespace named options
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-02-15 11:29:29 -05:00
Alfredo Deza
676c93fcf3
ceph-volume tests check for mount/format usage from ceph.conf
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-02-15 11:29:29 -05:00
Alfredo Deza
a8eecc6471
ceph-volume tests add ceph.conf stub for custom conf files
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-02-15 11:29:28 -05:00
Mykola Golub
cd3ae9b81f
Merge pull request #20423 from dillaman/wip-22945
...
librbd: new tag should use on-disk committed position
Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-02-15 14:13:45 +02:00