Commit Graph

78539 Commits

Author SHA1 Message Date
Kefu Chai
38751c70a5 Merge pull request #17806 from tchaikov/wip-osdc-new-options
osdc/Journaler: use new style options

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-22 12:44:36 +08:00
Kefu Chai
baba8015b6 Merge pull request #17823 from xiexingguo/wip-clone-bytes
osd/osd_type: get_clone_bytes - inline size() for overlapping size

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-22 12:43:03 +08:00
Kefu Chai
e8741d5ed8 Merge pull request #17794 from hjwsm1989/wip-21425
qa/suites/rest/basic/tasks/rest_test: more whitelisting

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-22 12:42:27 +08:00
Kefu Chai
5dbfa1436d Merge pull request #17744 from xiexingguo/wip-blue-eio
os/bluestore: propagate read-EIO to high level callers

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-22 12:41:21 +08:00
Kefu Chai
f27ca5015f Merge pull request #17460 from dengquan/master
java/native: fix milliseconds to mtime/atime conversion

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-22 12:40:18 +08:00
Kefu Chai
032965fa61 Merge pull request #17422 from aclamk/fix-cmake-unsupported-allocator
cmake: in case of bad "ALLOCATOR" selected issue warning

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-22 12:33:36 +08:00
Kefu Chai
ab22dd4ee4 Merge pull request #17374 from jcsp/wip-mgr-config-tidy
mgr: use new style config opts + add metadata

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-22 12:32:13 +08:00
Kefu Chai
fff6f2e812 Merge pull request #17309 from jcsp/wip-daemonserver-locks
mgr: locking fixes

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-22 12:30:41 +08:00
Kefu Chai
5c8e65a2a4 osdc/Journaler: use new style options
also use uint64_t for these options, as they are casted to uint64_t when
reading from conf.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-22 12:28:21 +08:00
Kefu Chai
3988bf26ed Merge pull request #17830 from Yan-waller/wip-walle-0920primarypg
osd/PrimaryLogPG: misc cleanups

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-22 12:24:07 +08:00
Boris Ranto
4042c8eba5 Merge pull request #17891 from b-ranto/wip-selinux-lnk-getattr
selinux: Allow getattr on lnk sysfs files

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2017-09-22 04:35:26 +02:00
Sage Weil
3a6a0f4ab0 Merge pull request #17739 from liewegas/wip-filestore-configs
common/options: document filestore and filejournal options

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-21 21:25:52 -05:00
Sage Weil
787ea8aba0 Merge pull request #17740 from liewegas/wip-objecter-configs
common/options: document objecter, filer, and journal options

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-21 21:25:36 -05:00
Sage Weil
91b65236c8 Merge pull request #17579 from liewegas/wip-kill-snapdirs
osd: kill snapdirs

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-21 21:25:17 -05:00
Kefu Chai
bf6619cb22 Merge pull request #17895 from ivancich/wip-fix-mclock-coverity
tests: fix uninitialized value found by coverity scan

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-22 10:04:38 +08:00
J. Eric Ivancich
63be40152c tests: fix uninitialized value found by coverity scan
Unit test for mclock priority queue had a default constructor, which
didn't initialize a value.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
2017-09-21 15:24:19 -04:00
Sage Weil
65bec679f2 common/options: document filestore and filejournal options
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:37:37 -04:00
Sage Weil
c065ef48a5 osd/PrimaryLogPG: can_create false for cache ops
Some cache ops do writes, but none of them *create* objects, so we
should not set can_create.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:35 -04:00
Sage Weil
d5efb8a7be osd/PrimaryLogPG: drop odd maintain_ssc hack
This was added two years ago by b61f3e43f1c9d43daa0dedd7cbd0fe5787cbdfbb,
but I can see why it is needed here.  The test case for that
original bug (from a3442cf07841a7269713e30ca270f2f9c356a598) passes
fine.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:35 -04:00
Sage Weil
e4c4942467 ceph-objectstore-tool: drop pre-snapset support for setting up snapmapper
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:35 -04:00
Sage Weil
c6275e7d4d ceph-objectstore-tool: drop head_exists corruption
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:35 -04:00
Sage Weil
76f1c14c77 ceph_test_rados_api_pool: make LibRadosPools.PoolList tolerate long pool names
There was a baked-in assumption that the first pool was <20 chars.
No more!

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:35 -04:00
Sage Weil
cc17c22b43 osd/osd_types: object_info_t: remove legacy_snaps
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:35 -04:00
Sage Weil
8c3f484813 osd/PrimaryLogPG: drop last legacy_snaps users (just debug output!)
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:34 -04:00
Sage Weil
900d23a94d osd/osd_types: SnapSet: remove head_exists
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:34 -04:00
Sage Weil
0e707ae40b osd: drop last head_exists = true calls
No more users!

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:34 -04:00
Sage Weil
5e13884acc osd/PrimaryLogPG: find_object_context: drop !head_exists path
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:34 -04:00
Sage Weil
a9145997db osd/PrimaryLogPG: do_osd_ops: head_exists is always true for LIST_SNAPS
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:34 -04:00
Sage Weil
b5ac17874d osd/osd_types: SnapSet: drop is_legacy
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:34 -04:00
Sage Weil
fca22aae5d osd/PrimaryLogPG: start_flush: drop legacy snapset handling
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:34 -04:00
Sage Weil
222a5e6f13 osd/osd_types: default head_exists = true
This will be helpful as we start removing code that would otherwise
set this to true in some convoluted way.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:33 -04:00
Sage Weil
8924bbeb5f osd/PrimaryLogPG: finish_promote: drop legacy snapset handling
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:33 -04:00
Sage Weil
cec378d94d osd/PrimaryLogPG: do_copy_get: drop legacy snapset path
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:33 -04:00
Sage Weil
3671bef26b osd/PrimaryLogPG: _delete_oid: drop legacy snapset handling
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:33 -04:00
Sage Weil
8d55ba7e2c osd/PrimaryLogPG: do_osd_ops: drop legacy snapset handling from LIST_SNAPS
This is so much simpler, yay!

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:33 -04:00
Sage Weil
1f90d10b2a osd/PrimaryLogPG: on_local_recover: drop legacy snapset handling
This was there to deal with jewel peers, which are no more.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:33 -04:00
Sage Weil
e3779d9e0f osd/PG: _scan_snaps: drop legacy snapset handling
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:33 -04:00
Sage Weil
89c3439191 osd/PrimaryLogPG: find_object_context: drop legacy snapset handling
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:33 -04:00
Sage Weil
bd36330ff8 osd/PrimaryLogPG: issue_repop: drop obsolete condition on head_obc
The only user is trim_object, which sets obc = clone, head_obc =
head.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:32 -04:00
Sage Weil
b01783fb97 osd/PrimaryLogPG: snapset_obc -> head_obc
This is only used for trim_object, now!

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:32 -04:00
Sage Weil
93ae366bff osd/PrimaryLogPG: do_op: drop snapset_obc lookup on snapdir
We'll never find it.  This also means we can drop the goofy hack
to clear it for cache tiers.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:32 -04:00
Sage Weil
0d45f26243 osd/PrimaryLogPG: trim_object: ctx->snapset_obc -> head_obc
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:32 -04:00
Sage Weil
a53e731f8f osd/PrimaryLogPG: trim_object: simplify a bit more for post-snapdir world
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:32 -04:00
Sage Weil
203cd6fe81 osd/PrimaryLogPG: trim_object: drop legacy SnapSet handling
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:32 -04:00
Boris Ranto
394c26adb9 selinux: Allow getattr on lnk sysfs files
This showed up during downstream testing for luminous. We are doing
getattr on the sysfs lnk files and the current policy does not allow
this.

Signed-off-by: Boris Ranto <branto@redhat.com>
2017-09-21 17:24:10 +02:00
Xie Xingguo
7d7993fd37 Merge pull request #17872 from joscollin/wip-osdmap-signed-unsigned-warning
osd: silence warnings from -Wsign-compare

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-21 21:02:57 +08:00
Jos Collin
85d6e4b09b osd: silence warnings from -Wsign-compare
Fixed the warning :

ceph/src/osd/OSDMap.cc: In member function ‘int OSDMap::validate_crush_rules(CrushWrapper*, std::ostream*) const’:
ceph/src/osd/OSDMap.cc:3278:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
     if (pool.get_size() < (int)newcrush->get_rule_mask_min_size(ruleno) ||
         ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ceph/src/osd/OSDMap.cc:3279:18: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
  pool.get_size() > (int)newcrush->get_rule_mask_max_size(ruleno)) {
  ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-09-21 12:45:15 +05:30
Kefu Chai
998bf1b43c Merge pull request #17833 from mogeb/cache-tiering-doc
doc: update link to placing-different-pools

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-21 11:10:10 +08:00
Patrick Donnelly
82e63350c2
Merge PR #17849 into master
* refs/remotes/upstream/pull/17849/head:
	qa: get config only on running MDS

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-20 18:33:45 -07:00
Patrick Donnelly
8a535d9c72
qa: get config only on running MDS
Fixes: http://tracker.ceph.com/issues/21466

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-20 15:47:28 -07:00