Kefu Chai
7d583f1ec4
Merge pull request #18577 from tchaikov/wip-kill-clang-warning
...
ceph-syn: silence clang analyzer warning
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2017-10-31 12:02:10 +08:00
Kefu Chai
caf9ee5c60
qa: add "restful" to ceph_mgr_modules in ceph-ansible suite
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-31 11:21:58 +08:00
Patrick Donnelly
010ece1d78
ptl-tool: print bzs/tickets cited in commit msgs
...
This makes it easier to update issues after a merge.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-30 20:11:35 -07:00
Enming Zhang
3d2f63de49
rgw: lc fix rgw crash when lc configuration xml not including ID
...
When a putting lc config request does not include an ID tag in lc
configuration xml, RGW should generate a random ID for the lc
configuration.
At present RGW will crash when generate a random ID for
lc configuration.
Fixes: http://tracker.ceph.com/issues/21980
Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
2017-10-31 11:10:00 +08:00
Sage Weil
87f4c36107
Merge pull request #18631 from gohighsec/cleanup
...
os/bluestore: delete redundant header file in KernelDevice.cc
Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-30 21:18:38 -05:00
lijing
6914ab2109
bluestore: delete redundant header file in KernelDevice.cc
...
Signed-off-by: Jing Li <lijing@gohighsec.com>
2017-10-31 09:44:14 +08:00
Sage Weil
ce6ba63e14
Merge pull request #18603 from batrick/i21945
...
mon/MDSMonitor: wait for readable OSDMap before sanitizing
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-30 15:43:11 -05:00
Adam C. Emerson
343a25aa21
rgw: Fix evaluation of bucket management permissions
...
I spent some more time looking through the documentation of how work
is evaluated, and the examples on
<http://docs.aws.amazon.com/AmazonS3/latest/dev/
access-control-auth-workflow-bucket-operation.html>
Have convinced me that the behavior that was requested is more correct
than what we were doing before.
Fixes: http://tracker.ceph.com/issues/21901
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2017-10-30 16:17:24 -04:00
Casey Bodley
83d6b493f7
qa: add ceph_test_cls_log to cls workunit
...
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-10-30 15:31:03 -04:00
Patrick Donnelly
456b68c375
Merge PR #18039 into master
...
* refs/pull/18039/head:
mgr/dashboard: redirect away if viewed filesystem is removed
mgr/dashboard: 404 instead of 500 on missing filesystem
mds: fix FSMap copy constructor
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-30 12:24:23 -07:00
Yehuda Sadeh
ca4f10b3ee
Merge pull request #18477 from ZVampirEM77/wip-em-cleanup
...
rgw: drop unused variable in copy_obj_data()
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-10-30 11:20:05 -07:00
Casey Bodley
95faac9ae2
osd: add processed_subop_count for cls_cxx_subop_version()
...
cls_log_add() relies on cls_cxx_subop_version() to generate unique keys
for log entries with the same timestamp. because cls calls back into
do_osd_ops(), resetting current_osd_subop_num means that cls_log_add()
will keep seeing the same subop version and generating the same keys.
this causes the following failure in ceph_test_cls_log:
[ RUN ] cls_rgw.test_log_add_same_time
/home/cbodley/ceph/src/test/cls_log/test_cls_log.cc:144: Failure
Expected: 10
To be equal to: (int)entries.size()
Which is: 1
[ FAILED ] cls_rgw.test_log_add_same_time (1180 ms)
Fixes: http://tracker.ceph.com/issues/21964
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-10-30 14:19:02 -04:00
Enming Zhang
9c0abe6d63
rgw: lc support Content-MD5 in request headers
...
According to AWS S3, this header must be used
as a message integrity check to verify that
the request body was not corrupted in transit.
Content-MD5 is the base64-encoded 128-bit MD5
digest of the data
Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
2017-10-31 01:30:29 +08:00
Ilya Dryomov
91b8fd5ee4
Merge pull request #18579 from idryomov/wip-doc-kclient-snapshots
...
doc/cephfs/experimental-features: kernel client snapshots limit
Reviewed-by: Zheng Yan <zyan@redhat.com>
2017-10-30 17:42:23 +01:00
Jason Dillaman
8583270fd2
librbd: track image open and lock acquire time via perf counter
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-10-30 11:48:34 -04:00
Alfredo Deza
9421c87944
Merge pull request #18513 from ceph/ceph-volume-zap
...
ceph-volume: adds the ceph-volume lvm zap subcommand
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-10-30 10:57:33 -04:00
xie xingguo
8c630a040e
osd/PrimaryLogPG: add_object_context_to_pg_stat - fix stat
...
There might be holes in the extents map, thus it is not always
consistent to calc the clone bytes this way.
Instead we could switch to its own (simpler and consistent) way to
count used bytes for head-object and clone respectively.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-10-30 21:32:43 +08:00
xie xingguo
83594df164
osd/osd_type.cc: use "<<" directly for oi.extents
...
there's already a builtin operator<< for interval_set,
which is simpler.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-10-30 21:32:43 +08:00
xie xingguo
3b4cec7ec6
osd/PrimaryLogPG: make oi.extents handle 0-length write/write_full properly
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-10-30 21:32:42 +08:00
Jason Dillaman
c0cbf6aa90
Merge pull request #18615 from rgdoliveira/alpine
...
rbd-fuse: make sure PATH_MAX is defined
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-10-30 08:51:34 -04:00
Kefu Chai
3bd808d02a
Merge pull request #17363 from tchaikov/wip-ceph-disk
...
ceph-disk: unlock all partitions when activate
Reviewed-by: Sébastien Han <seb@redhat.com>
2017-10-30 20:29:14 +08:00
Sage Weil
1ff950d53e
Merge pull request #18585 from yaozongyou/fix-bluestore-tool-arg-bug
...
ceph-bluestore-tool: link target shouldn't ending with "\n"
Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-30 07:00:46 -05:00
Sage Weil
74b1c0a199
Merge pull request #17995 from scienceluo/wip-luo-fix-bluestore-metadata-branch
...
os/bluestore/BlueFS: Reduce unnecessary operations in collect_metadata
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-10-30 07:00:29 -05:00
Roberto Oliveira
972c34465d
rbd-fuse: make sure PATH_MAX is defined
...
On systems without glibc, as Alpine Linux, you might lack definition of
PATH_MAX. This patch adds the limits.h header to solve this issue.
Signed-off-by: Roberto Oliveira <robertoguimaraes8@gmail.com>
2017-10-30 11:59:47 +00:00
Sage Weil
39eec2c569
Merge pull request #18611 from liewegas/wip-interval-set
...
include/interval_set: parameterize by map type and kill btree_interval_set.h
Reviewed-by: Adam Emerson <aemerson@redhat.com>
2017-10-30 06:59:41 -05:00
Mohamad Gebai
86dad04a24
tools/rados: use the monotonic clock in rados bench
...
Use the steady (CLOCK_MONOTONIC) clock in the bencher. The clock is used
to measure the passage of time between events, making the monotonic clock
more suited. The system clock is affected by all changes to the system's wall
clock time, which makes it unfit to compare events times relatively to each
other.
Fixes http://tracker.ceph.com/issues/21375
Signed-off-by: Mohamad Gebai <mgebai@suse.com>
2017-10-30 05:58:11 -04:00
Kefu Chai
cabd93e87f
Merge pull request #18507 from hjwsm1989/skip-generation-object
...
ceph-objectstore-tool: skip object with generated version
Reviewed-by: David Zafman <dzafman@redhat.com>
2017-10-30 16:33:47 +08:00
Kefu Chai
12df4aa74e
Merge pull request #18493 from liewegas/wip-unclean-degraded
...
mon/PGMap: 'unclean' does not imply damaged
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-10-30 15:02:32 +08:00
Mykola Golub
cb90069604
qa/workunits/rbd: unnecessary sleep after failed remove
...
Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
2017-10-30 08:57:29 +02:00
Kefu Chai
b3d49f88ea
mds: pass a reference of function to sanitize() not a copy
...
to save the overhead of creating and destoying a copy of the function
closure.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-30 14:51:59 +08:00
Yang Honggang
e08c246ef2
os/bluestore/bluestore_tool: add bluefs-log-dump command to dump bluefs's log
...
./bin/ceph-bluestore-tool --command bluefs-log-dump --path dev/osd0/
...
0x1000: txn(seq 2 len 0xd7 crc 0x306e389b)
0x1000: op_dir_create db
0x1000: op_dir_create db.wal
0x1000: op_dir_create db.slow
0x1000: op_file_update file
Signed-off-by: Yang Honggang <joseph.yang@xtaotech.com>
2017-10-29 23:10:00 -04:00
Sage Weil
059d046745
Merge pull request #18553 from liewegas/wip-preempt-feature
...
osd/PG: remote recovery preemption, and new feature bit to condition it on
Reviewed-by: David Zafman <dzafman@redhat.com>
2017-10-29 21:36:38 -05:00
Myna V
1ab883b972
Added sanity checks in ECUtil::decode for input repair buffer sizes before
...
it asserts for non-zeros size.
Authors: Myna, Elita.
Signed-off-by: Myna Vajha <mynaramana@gmail.com>
2017-10-30 07:57:05 +05:30
Myna V
33d79f303d
Introducing sub-chunks. Replaced the old decode, minimum_to_decode
...
with new decode, minimum_to_decode in ErasureCodeInterface.
Updated ECBackend, ECUtil to use the new functions.Fixed the test cases
to use the new functions.
Fixed the review comments.
Authors: Myna, Elita.
Signed-off-by: Myna Vajha <mynaramana@gmail.com>
2017-10-30 07:57:05 +05:30
Yuri Weinstein
51d0dbe315
Merge pull request #18594 from zmc/wip-cephmetrics
...
suites/cephmetrics: Add Centos 7
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
2017-10-29 18:25:43 -07:00
Jason Dillaman
7a9d10a4e6
librbd: export read and writes performance counters for daemons
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-10-29 08:13:27 -04:00
Jason Dillaman
2224e5ca1d
librbd: moved performance counter enums to common location
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-10-29 08:13:27 -04:00
Jason Dillaman
ce2ae1d7c0
librbd: track the child of an image in-memory
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-10-29 08:13:27 -04:00
Mykola Golub
f2127532df
Merge pull request #18601 from dillaman/wip-21961
...
rbd-mirror: clean up spurious error log messages
Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
2017-10-29 09:03:15 +02:00
Sage Weil
3d1b782cca
osd/PG: handle spurious remote revoke or toofull
...
If we restart the recovery reservation process for some reason (e.g.,
local preemption), we may still get a racing REVOKE from the replicas in
the previous round. Ignore.
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-28 22:49:44 -05:00
Yan, Zheng
80cf872d82
mds: fix race in PurgeQueue::wait_for_recovery()
...
After PurgeQueue::wait_for_recovery() locks the mutex, purge queue
may have already been recovered.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
2017-10-29 07:55:11 +08:00
Jason Dillaman
625222edbc
rbd-mirror: journal debug message should not be logged as error
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-10-28 18:30:17 -04:00
Jason Dillaman
1e1d15eb0c
rbd-mirror: avoid attempting to decode an empty client data buffer
...
Fixes: http://tracker.ceph.com/issues/21961
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-10-28 18:29:10 -04:00
Mykola Golub
0d19edf6c5
Merge pull request #18604 from dillaman/wip-21960
...
cls/journal: ensure tags are properly expired
Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
2017-10-29 00:27:39 +03:00
Sage Weil
70ddb0c18b
unittest_interval_set: test with flat_map<> too
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-28 16:25:05 -05:00
Sage Weil
3dafe9d33e
include/btree_interval_set: remove it!
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-28 16:25:05 -05:00
Sage Weil
762dd42971
os/bluestore: use interval_set<...,btree_map<...>>
...
This avoid the code duplication, yay!
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-28 16:25:05 -05:00
Sage Weil
78d5afde43
include/btree_map: clean up wrapper header around btree_map
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-28 16:25:05 -05:00
Sage Weil
79f9c86dfd
os/bluestore/BitMapAllocator: drop useless include
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-28 16:25:05 -05:00
Sage Weil
7bbb7958df
include/interval_set: cbegin/cend -> begin/end
...
c{begin,end} don't exist for btree_map<>.
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-28 16:25:05 -05:00