Xie Xingguo
3c7c8c991d
Merge pull request #23317 from xiexingguo/wip-fix-polog-overtrim
...
osd/PrimaryLogPG: fix potential pg-log overtrimming
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Yan Jun <yan.jun8@zte.com.cn>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-09-21 14:44:35 +08:00
Kefu Chai
fda8befc53
tools: fix typos in user-visible message and comments
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 12:43:33 +08:00
Kefu Chai
98b7e6b896
tools,test: fix typos in comments and usage message
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 12:43:33 +08:00
Kefu Chai
a2eff2fc32
script: fix typos
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 12:43:33 +08:00
Kefu Chai
3b062b4278
rgw: fix typos
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 12:43:33 +08:00
Kefu Chai
1544ef05bf
pybind/rados: fix typos
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 12:43:33 +08:00
Kefu Chai
67157ec7fd
pybind/mgr: fix typos
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 12:43:33 +08:00
Kefu Chai
c33ce07fb8
mount,osdc: fix typos
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 12:43:33 +08:00
Kefu Chai
34975103ea
mgr/PyFormatter: fix typos
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 12:43:33 +08:00
Kefu Chai
37c9dc3dc9
mds: fix typos
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 12:43:33 +08:00
Kefu Chai
b54c6432f9
common: fix typos
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 12:43:33 +08:00
Kefu Chai
1d67bc10be
rbd: fix typos
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 12:43:33 +08:00
Kefu Chai
316a74dbf8
client: fix typos
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 12:41:42 +08:00
Kefu Chai
a4ece9cae6
ceph-volume: fix typos
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 12:41:42 +08:00
Kefu Chai
4b0e2c8ed4
qa: fix typos
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 12:41:42 +08:00
Kefu Chai
1af4e4d426
debian/changelog: fix typos
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 12:41:42 +08:00
Kefu Chai
3229c7acd9
cmake: fix typos
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 12:41:42 +08:00
Kefu Chai
5ee1fd2c32
doc: fix typos
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 12:41:42 +08:00
Kefu Chai
cc424b95af
Merge pull request #24126 from planetbeing/patch-1
...
arch/arm: Allow ceph_crc32c_aarch64 to be chosen only if it is compil…
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-09-21 11:47:03 +08:00
Sage Weil
6be421539d
Merge PR #24191 into master
...
* refs/pull/24191/head:
src/include:fix unused parameter
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-09-20 17:30:42 -05:00
Sage Weil
9c9431d955
Merge PR #23979 into master
...
* refs/pull/23979/head:
crush/CrushWrapper: fix crush tree json dumper
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-09-20 17:30:06 -05:00
Sage Weil
db40d73ae6
Merge PR #23978 into master
...
* refs/pull/23978/head:
mgr: add get_latest_counter() to C++ -> Python interface.
mgr: remove PerfCounterInstance::get_current()
mgr: remove PyFormatter copy constructor; shouldn't be called
Reviewed-by: John Spray <john.spray@redhat.com>
2018-09-20 17:29:47 -05:00
Alfredo Deza
83ee452f4a
Merge pull request #24150 from alfredodeza/wip-rm24794
...
ceph-volume: earlier detection for --journal and --filestore flag requirements
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2018-09-20 17:26:54 -04:00
AntonOks
25b1def601
doc: added some Civetweb configuration options
...
Signed-off-by: Anton Oks <anton.oks@gmx.de>
2018-09-20 21:38:15 +02:00
AntonOks
905281b713
doc: added some Civetweb configuration options
...
Signed-off-by: Anton Oks <anton.oks@gmx.de>
2018-09-20 21:31:49 +02:00
Sage Weil
5322f99370
Merge PR #24107 into master
...
* refs/pull/24107/head:
common: Lock -> lock, Unlock -> lock, TryLock -> try_lock
common: Mutex::Locker -> std::lock_guard<Mutex>
common/Mutex: typedef lock_guard<Mutex> Locker
common/Mutex: Lock -> lock, Unlock -> unlock
common/Mutex: kill mutex_perf_counter
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2018-09-20 14:29:55 -05:00
Mykola Golub
cd7f2fca17
Merge pull request #24181 from dillaman/wip-36084
...
rbd-mirror: instantiate the status formatter before changing state
Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-09-20 22:26:11 +03:00
Casey Bodley
21cb2b4fd0
Merge pull request #23843 from cbodley/wip-rgw-dpp-datasync
...
rgw: log refactoring for data sync
Reviewed-by: Ali Maredia <amaredia@redhat.com>
2018-09-20 14:03:19 -04:00
Sage Weil
0a235d6927
ceph-objectstore-tool: add back pool dne check
...
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-20 12:58:00 -05:00
Sage Weil
4e5f2bb596
qa/suites/rados/singleton/reg11184: remove old test
...
This bug was about filtering missing and divergent when doing a partial
PG import. We don't support partial PG imports any more, so this can
go away!
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-20 12:58:00 -05:00
Sage Weil
26cb966cab
ceph-objectstore-tool: import pg at original epoch
...
- In the jewel era, we fast-forwarded the PG to the OSD's latest epoch
and cleared past_intervals.
- In mimic, as of 2347ecb961
, we brought the
PG up to date while updating past_intervals. (At the same time we removed
the OSD's parallel past_intervals regeneration.)
The problem is that the tool then has to reimplement the past_intervals
update logic, and *also* has to cope with splits and merges. Splits are
somewhat easier (until now we enable partial import of a PG into a split
child), but merges are not so easy.
This patch changes it so we import the PG and leave the pg_epoch matching
the import file. The OSD is then responsible for bringing it up to date
with the latest map, and dealing with any intervening splits or merges.
We also adjust the safety check to ensure that we don't collide with
any existing PG, either a child we eventually split into, or a parent
we eventually merge into.
Fixes: http://tracker.ceph.com/issues/35955
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-20 12:58:00 -05:00
Patrick Donnelly
2bfaac762d
ceph-fuse: add to selinux profile
...
Fixes: http://tracker.ceph.com/issues/36103
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-09-20 10:27:43 -07:00
Sage Weil
57c34b1905
Merge PR #24197 into master
...
* refs/pull/24197/head:
doc: remove Calamari content from ceph-deploy
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2018-09-20 12:16:05 -05:00
Andrew Schoen
0def1a8349
Merge pull request #24201 from alfredodeza/wip-rm36088
...
ceph-volume batch: allow journal+block.db sizing on the CLI
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2018-09-20 11:53:14 -05:00
Sage Weil
f35e10f484
mon/MonClient: fix wait for monmap+config is non-cephx case
...
In the auth_none case, we were exiting the get_monmap_and_config() loop
early, before we got a monmap, because the default constructed monmap
did not have the mimic feature. Make sure we wait for both the monmap
and config.
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-20 11:52:27 -05:00
Jason Dillaman
765f8ce253
librbd: properly handle potential object map failures
...
Remove the "ceph_assert" statements and instead bubble any potential
error code up to the caller. The object map state machines should
attempt to return a 0 upon failure unless it was unable to flag the
object map as invalid.
Fixes: http://tracker.ceph.com/issues/36074
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-09-20 12:43:11 -04:00
Patrick Donnelly
3e3b69dbde
Merge PR #24156 into master
...
* refs/pull/24156/head:
qa/tests: removed knfs suite
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-09-20 09:31:50 -07:00
Patrick Donnelly
a14716a533
Merge PR #24153 into master
...
* refs/pull/24153/head:
qa/tests: removed knfs from crontab
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-09-20 09:31:15 -07:00
Ricardo Marques
367c634b82
Merge pull request #23960 from votdev/feature_35695
...
mgr/dashboard: Refactor role management
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
2018-09-20 17:24:41 +01:00
Mykola Golub
e86898a7f5
Merge pull request #23829 from dillaman/wip-34534
...
librbd: blacklisted client might not notice it lost the lock
Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-09-20 18:52:57 +03:00
Patrick Donnelly
86dbd9e755
*: set missing CLOEXEC on opened fds
...
Otherwise these descriptors may leak across execve() during e.g. MDS respawn.
Fixes: http://tracker.ceph.com/issues/35850
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-09-20 08:06:08 -07:00
Patrick Donnelly
7e91c8b5aa
msg: set O_NONBLOCK on file status flags
...
There is no NONBLOCK file **descriptor** flag.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-09-20 08:06:08 -07:00
Patrick Donnelly
e606e21746
Merge PR #24185 into master
...
* refs/pull/24185/head:
qa: install build dependencies for cfuse_workunit_kernel_untar_build.yaml
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-09-20 08:02:48 -07:00
Alfredo Deza
042c2cbe47
doc/man/ceph-volume update batch command with new sizing flags
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-09-20 11:02:14 -04:00
Alfredo Deza
5df56a09c7
ceph-volume tests.devices update fixture to include new size flags for strategies
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-09-20 11:02:14 -04:00
Alfredo Deza
2378c282c7
ceph-volume lvm.batch.filestore consume --journal-size
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-09-20 11:02:13 -04:00
Alfredo Deza
7e52bc559b
ceph-volume lvm.batch.bluestore consume --block-db-size
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-09-20 11:02:13 -04:00
Sage Weil
1bf449cdba
Merge PR #23415 into master
...
* refs/pull/23415/head:
msgr/async: huge refactoring of protocol V1
msgr/async: fix forward declaration of DispatchQueue
Reviewed-by: Sage Weil <sage@redhat.com>
2018-09-20 09:30:41 -05:00
Xie Xingguo
a3e58900bb
Merge pull request #24175 from xiaomanh/master
...
doc: Fix Spelling Error In File dynamicresharding.rst
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-09-20 22:03:14 +08:00
Sage Weil
fe29c6ff52
osd: simplify init of fabricated pg
...
This was similar (but different) to the logic in PG::merge_from(). Do not
do any initialization here, and instead rely on merge_from() to do the
right thing.
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-20 08:35:53 -05:00