David Zafman
1dda0411f4
ceph-osdomap-tool: Fix seg fault with large amount of check error output
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-03-27 08:33:34 -07:00
David Zafman
4cd3c74c92
osd: Add automatic repair for DBObjectMap bug
...
Add repair command to ceph-osdomap-tool too
Under some situations the previous rm_keys() code would
generated a corrupt complete table. There is no way to
figure out what the table should look like now. By removing
the entries we fix the corruption and aren't much worse off
because the corruption caused some deleted keys to re-appear.
This doesn't breaking the parent/child relationship during
repair because some of the keys may still be contained
in the parent.
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-03-27 08:33:34 -07:00
David Zafman
666f14ed90
ceph-osdomap-tool: Fix tool exit status
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-03-27 08:33:05 -07:00
Samuel Just
c4dffb68ea
DBObjectMap: rewrite rm_keys and merge_new_complete
...
Leverage the updated in_complete_region and needs_parent to simplify
these methods.
Signed-off-by: Samuel Just <sjust@redhat.com>
2017-03-27 08:33:05 -07:00
Samuel Just
97b35f4d7d
DBObjectMap: strengthen in_complete_region post condition
...
Previously, in_complete_region didn't guarantee anything about
where it left complete_iter pointing. It will be handy for
complete_iter to be pointing at the lowest interval which ends
after to_test. Make it so.
Signed-off-by: Samuel Just <sjust@redhat.com>
2017-03-27 08:33:05 -07:00
Samuel Just
74a7631d09
DBObjectMap: fix next_parent()
...
The previous implementation assumed that
lower_bound(parent_iter->key()) always leaves the iterator
on_parent(). There isn't any guarantee, however, that that
key isn't present on the child as well.
Signed-off-by: Samuel Just <sjust@redhat.com>
2017-03-27 08:33:05 -07:00
Samuel Just
f131dbcf5b
test_object_map: add tests to trigger some bugs related to 18533
...
Signed-off-by: Samuel Just <sjust@redhat.com>
2017-03-27 08:33:05 -07:00
David Zafman
0e97a01bd7
test: Add ceph_test_object_map to make check tests
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-03-27 08:33:05 -07:00
David Zafman
5fb2b2d139
ceph-osdomap-tool: Add --debug and only show internal logging if enabled
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-03-27 08:33:05 -07:00
David Zafman
fcf1e17c64
osd: DBOjectMap::check: Dump complete mapping when inconsistency found
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-03-27 08:33:05 -07:00
David Zafman
053a273cbc
test_object_map: Use ASSERT_EQ() for check() so failure doesn't stop testing
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-03-27 08:33:05 -07:00
David Zafman
e5e8eb962d
tools: Check for overlaps in internal "complete" table for DBObjectMap
...
Changed check to return an error count and fix tool error message
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-03-27 08:33:04 -07:00
David Zafman
f4101591ad
tools: Add dump-headers command to ceph-osdomap-tool
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-03-27 08:32:28 -07:00
David Zafman
2d94889e9e
tools: Add --oid option to ceph-osdomap-tool
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-03-27 08:31:12 -07:00
David Zafman
937e6a03ea
osd: Remove unnecessary assert and assignment in DBObjectMap
...
Fix and add comment(s)
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-03-27 08:31:12 -07:00
Kefu Chai
52468ae1f9
Merge pull request #13754 from liewegas/wip-objectstore-random
...
os: allow 'osd objectstore = random' to pick either filestore or bluestore
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-03-27 22:58:29 +08:00
Jianpeng Ma
903b3fcf4a
os/bluestore: remove unuse perfcounter:l_bluestore_read_wait_flush_lat.
...
Now read don't need flush(). See commit 83e33a32fd
.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-27 10:38:36 -04:00
Haomai Wang
53e0344628
Merge pull request #14088 from Adirl/rdma-cm-2
...
msg/async/rdma: Move resource handling to Device
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-03-27 22:25:09 +08:00
John Spray
31fa2fe35f
Merge pull request #13915 from jcsp/wip-19253
...
qa: whitelist new fullness messages in fs tests
2017-03-27 10:22:43 -04:00
Jason Dillaman
91ce416c36
Merge pull request #14159 from tchaikov/wip-rbd-size_t-is-not-uint64_t-on-arm32
...
librbd: pass an uint64_t to clip_io() as the third param
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-03-27 09:33:56 -04:00
Kefu Chai
f7f5cc7aa1
librbd: pass an uint64_t to clip_io() as the 3rd param
...
because, on arm32, size_t is "unsigned", while uint64_t is "long long
unsigned int", compiler is not able to promote the former to the latter
automatically. and ImageRequest::Extents::value_type::second_type is
indeed uint64_t, which is expected by clip_io(). so let's just use
"auto" here.
Fixes: http://tracker.ceph.com/issues/18938
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-03-27 12:04:35 +08:00
Kefu Chai
a965e0276b
Merge pull request #10412 from stiopaa1/mon_monitorh_addConstToGetLeader
...
mon/Monitor.h: add const to member function
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-03-27 11:33:36 +08:00
Jason Dillaman
a5b798fffc
Merge pull request #14146 from liupan1111/wip-fix-comment
...
rbd-nbd: clean up the doc and help information
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-03-26 22:37:45 -04:00
Matt Benjamin
b894dc6348
Merge pull request #12893 from rzarzynski/wip-rgw-auth-rework-cont-2
...
rgw: continuation of the auth rework
2017-03-26 13:37:14 -04:00
Michal Jarzabek
49ee6939e7
mon/Monitor.h: add const to member functions
...
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2017-03-26 17:47:36 +01:00
Orit Wasserman
9de1f1a676
Merge pull request #10121 from theanalyst/wip-16357
...
rgw: cls_user don't clobber existing bucket stats when creating bucket
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2017-03-26 10:33:28 +03:00
Pan Liu
5c8d7bd1e4
rbd-nbd: polish the doc and help information.
...
Signed-off-by: Pan Liu <liupan1111@gmail.com>
2017-03-26 14:12:28 +08:00
Mykola Golub
2e97d18b81
Merge pull request #14134 from wangzhengyong/doc
...
doc: add some undocumented options to rbd-nbd
Reviewed-by: Pan Liu <liupan1111@gmail.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-03-25 22:26:23 +02:00
Jason Dillaman
70f34cc64d
Merge pull request #14091 from trociny/wip-prepare_async_request
...
librbd: potential use of uninitialised value in ImageWatcher
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-03-25 16:21:00 -04:00
Haomai Wang
49d0003f5b
Merge pull request #13740 from Adirl/forksafe
...
msg/async/rdma: Add fork safe on RDMA
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-03-26 03:38:35 +08:00
Sage Weil
d8d24be869
Merge pull request #13965 from liewegas/wip-bluestore-pc
...
os/bluestore: fix perf counters
2017-03-25 13:08:33 -05:00
Sage Weil
42f3508a4b
Merge pull request #13962 from Liuchang0812/wip-add-override-in-osd-headers
...
osd: add override in headers files
Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-25 13:07:37 -05:00
wangzhengyong
02add5825c
doc: add some undocumented options to rbd-nbd
...
Signed-off-by: wangzhengyong@cmss.chinamobile.com
2017-03-25 22:37:58 +08:00
liuchang0812
acec741706
osd: add override in headers files
...
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-03-25 12:55:38 +08:00
Kefu Chai
e32b1b8793
Merge pull request #14114 from dmick/wip-boost-j
...
debian/rules, ceph.spec.in: invoke cmake with -DBOOST_J
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-03-25 12:13:17 +08:00
Radoslaw Zarzynski
9888ec33d5
rgw: implement the dynamic reconfiguration of auth strategies.
...
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2017-03-24 22:45:28 +01:00
Radoslaw Zarzynski
d3b04dfed7
rgw: the S3's local v2 auth engine becomes a fallback conditionally.
...
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2017-03-24 22:45:28 +01:00
Radoslaw Zarzynski
030a6fc9c5
rgw: implement SwiftAnonymousEngine.
...
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2017-03-24 22:45:28 +01:00
Radoslaw Zarzynski
92d44fe3a1
rgw: parametrize the implicit tenancy of rgw::auth::RemoteApplier.
...
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2017-03-24 22:45:28 +01:00
Radoslaw Zarzynski
f13f04bbb3
rgw: RGWPostObj_ObjStore_S3 doesn't instantiate auth strategy for each request anymore.
...
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2017-03-24 22:45:27 +01:00
Radoslaw Zarzynski
1ad1d83997
rgw: fix appending '\0' in the rgw::auth::LocalApplier::to_str().
...
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2017-03-24 22:43:59 +01:00
Sage Weil
2d32138670
Merge pull request #13889 from liewegas/wip-denc-nullptr
...
include/denc: remove nullptr runtime magic boundedness check
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-03-24 16:41:37 -05:00
Sage Weil
3d3d2def66
Merge pull request #14096 from baiyanchun/remove_useless_parameter
...
common: remove useless parameter
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Pan Liu <liupan1111@gmail.com>
2017-03-24 16:41:18 -05:00
Sage Weil
50c9fd74f4
Merge pull request #14131 from liewegas/wip-crush-encode
...
crush: only encode class info if SERVER_LUMINOUS
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-03-24 15:28:27 -05:00
Sage Weil
d44d859630
Merge pull request #13960 from wangzhengyong/kstore
...
os/kstore: some error handling
Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-24 13:17:39 -05:00
Sage Weil
376a0b10aa
Merge pull request #13973 from shinobu-x/wp-sk-primarylogpg-null-nullptr
...
osd/PrimaryLogPG: nullptr not NULL
Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-24 13:16:58 -05:00
Sage Weil
cb6efd842c
Merge pull request #13995 from liuhongtong/wip-config
...
common/config: set rocksdb_cache_size to OPT_U64
Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-24 13:13:39 -05:00
Sage Weil
3283b284f8
Merge pull request #14013 from ShiqiCooperation/newshiqi
...
test/unittest_bluefs: check whether add_block_device success
Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-24 13:12:16 -05:00
Sage Weil
cadd94cb3a
crush: only encode class info if SERVER_LUMINOUS
...
This fixes OSDMap reencode crc mismatches on jewel to
luminous upgrades.
Fixes: http://tracker.ceph.com/issues/19361
Signed-off-by: Sage Weil <sage@redhat.com>
2017-03-24 13:59:34 -04:00
Dan Mick
e7485da1fa
ceph.spec.in: derive _smp_ncpus and use it for -DBOOST_J
...
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2017-03-24 10:53:52 -07:00