Casey Bodley
1f50f19cc1
Merge pull request #20863 from rjfd/wip-qa-fix-ssl-conflict
...
qa/rgw: renamed ssl task to openssl_keys
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-03-16 09:04:10 -04:00
Ricardo Dias
6014295076
Merge pull request #20925 from rjfd/wip-dashboard-fix-qa
...
qa/suites/rados/mgr/tasks/dashboard_v2: add fail_on_skip = false
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-03-16 09:38:52 +00:00
Ricardo Dias
7b774f1bb0
qa/suites/rados/mgr/tasks/dashboard: add fail_on_skip = false
...
This commit prevents dashboard API tests to be tagged as failed when
some test is decorated with @skip.
Signed-off-by: Ricardo Dias <rdias@suse.com>
2018-03-16 08:40:42 +00:00
Kefu Chai
349d7eb3ee
Merge pull request #20912 from rjfd/wip-dashboard-rename
...
mgr/dashboard: replace dashboard with dashboard_v2
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-03-16 16:36:51 +08:00
Ricardo Dias
aa205a6731
mgr/dashboard: renamed dashboard_v2 to dashboard
...
Signed-off-by: Ricardo Dias <rdias@suse.com>
2018-03-16 07:23:08 +00:00
Ricardo Dias
ed291d9e4d
mgr/dashboard: remove dashboard module
...
Signed-off-by: Ricardo Dias <rdias@suse.com>
2018-03-16 07:23:04 +00:00
Kefu Chai
23c130b338
Merge pull request #20916 from tspmelo/fix-mgr-perf-counter
...
mgr/dashboard_v2: fix test_perf_counters_mgr_get
Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-03-16 11:23:02 +08:00
Kefu Chai
f836de63a3
Merge pull request #20892 from guzhongyan/fix-mgrc
...
mgr: fix MSG_MGR_MAP handling
Reviewed-by: John Spray <john.spray@redhat.com>
2018-03-16 11:20:48 +08:00
Josh Durgin
9b72808469
Merge pull request #19811 from neha-ojha/wip-async-recovery
...
osd: async recovery
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
2018-03-15 15:39:34 -07:00
Sage Weil
1bd33de209
Merge pull request #20922 from idryomov/wip-osdmap-encoding-fix
...
osd/OSDMap: fix HAVE_FEATURE logic in encode()
Reviewed-by: Sage Weil <sage@redhat.com>
2018-03-15 16:07:09 -05:00
Sage Weil
69642f0e14
Merge remote-tracking branch 'gh/mimic-dev2'
...
# Conflicts:
# qa/standalone/osd/repro_long_log.sh
2018-03-15 16:02:30 -05:00
Sage Weil
91893003c9
Merge pull request #20917 from liewegas/wip-no-query-debug
...
osd: debug dispatch_context cases where queries not sent
Reviewed-by: Josh Durgin <jduring@redhat.com>
2018-03-15 15:59:58 -05:00
Sage Weil
d505f4d429
Merge pull request #20918 from liewegas/wip-less-many
...
qa/suites/rados: fewer msgr failures
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-03-15 15:59:42 -05:00
Sage Weil
596e4c2793
Merge pull request #20919 from liewegas/wip-cot
...
qa/standalone/osd/repro_long_log: no-mon-config for cot
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-03-15 15:59:22 -05:00
Neha Ojha
462d5634ea
PG: dout cleanup
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-15 12:59:28 -07:00
Neha Ojha
1b4f86cb04
PG: add async recovery and backfill to pg dout() prefix
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-15 11:13:34 -07:00
Neha Ojha
e68f2f0ff0
PG: use clear_location() to clear out missing_loc
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-15 11:13:34 -07:00
Neha Ojha
80c57b1ccd
PG: use get_recovery_read to prevent race during recovery deletes
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-15 11:13:34 -07:00
Neha Ojha
538ec88008
PG: handle async targets with missing clone in _rollback_to()
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-15 11:13:34 -07:00
Neha Ojha
bec9aaf744
ECBackend: send correct stats to async_recovery_targets
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-15 11:13:34 -07:00
Neha Ojha
7f6f4f90fe
qa: modify TEST_recovery_sizeup() to handle async recovery
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-15 11:13:34 -07:00
Neha Ojha
6ea566d3e0
PG: want set size should not be below min_size
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-15 11:13:34 -07:00
Neha Ojha
d25ad0cfa4
PG: clear missing_loc only during async_recovery
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-15 11:13:34 -07:00
Neha Ojha
8cf08f3ab8
PG: add location to missing_loc only during async_recovery
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-15 11:13:34 -07:00
Neha Ojha
b37d895a3a
PG: clear out old missing_loc in issue_repop
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-15 11:13:34 -07:00
Neha Ojha
20f90c5608
PG: handle degraded object in _rollback_to()
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-15 11:13:34 -07:00
Neha Ojha
ae6e001c5f
ECBackend: update pg_log missing for async_recovery_targets
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-15 11:13:33 -07:00
Neha Ojha
0a1e0cbee6
PG: skip primary in peer_missing in rebuild()
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-15 11:13:33 -07:00
Sage Weil
52db09afe0
Merge PR #20880 into wip-sage-testing-20180315.163409
...
* refs/pull/20880/head:
"Correct" license from LGPL2 to LGPL2.1
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2018-03-15 11:34:18 -05:00
Andrew Schoen
e27f9fb281
Merge pull request #20910 from ceph/fix_callback_plugins_dir
...
ceph-volume: fix action plugins path in tests
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2018-03-15 16:14:36 +01:00
Kefu Chai
363e94895b
Merge pull request #20897 from ifed01/wip-ifed-discard-on-mkfs
...
os/bluestore: do SSD discard on mkfs
Reviewed-by: Sage Weil <sage@redhat.com>
2018-03-15 23:09:29 +08:00
Kefu Chai
872df82aa8
Merge pull request #20895 from tchaikov/wip-drop-unused-options
...
common/options: drop unused options
Reviewed-by: John Spray <john.spray@redhat.com>
2018-03-15 23:08:24 +08:00
Kefu Chai
c9a201a5f9
Merge pull request #20445 from aclamk/wip-assert-smaller
...
common: Make code to invoke assert() smaller.
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-03-15 23:07:35 +08:00
Kefu Chai
0b7673dd93
Merge pull request #20887 from liewegas/wip-kill-backlog
...
osd/osd_types: remove backlog type for pg_log_entry_t
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-03-15 23:07:02 +08:00
Ilya Dryomov
e28e0c617a
osd/OSDMap: fix HAVE_FEATURE logic in encode()
...
Currently clients that don't have SERVER_LUMINOUS end up being fed
v6 (i.e. luminous) encoding because they also don't have SERVER_MIMIC.
This was introduced in commit 553048fbf97a ("osd/OSDMap: track newly
removed and purged snaps in each epoch").
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2018-03-15 15:37:29 +01:00
Sage Weil
69765a788e
qa/standalone/osd/repro_long_log: no-mon-config for cot
...
Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-15 08:42:14 -05:00
Sage Weil
ef7eaa48be
qa/suites/rados: fewer msgr failures
...
500 is a bit much... e.g., enough to hit timeouts forming mon quorum.
Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-15 08:39:28 -05:00
Sage Weil
85f980223d
osd: debug dispatch_context cases where queries not sent
...
Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-15 08:32:14 -05:00
Tiago Melo
a2033e0845
mgr/dashboard_v2: fix test_perf_counters_mgr_get
...
Now that we can obtain perf counters for the mgr, we need to assert that we get
more than 0 counters and that they have the desired structure.
Fixes: https://tracker.ceph.com/issues/23378
Signed-off-by: Tiago Melo <tmelo@suse.com>
2018-03-15 12:50:58 +00:00
Guillaume Abrioux
9fdc56717e
ceph-volume: fix action plugins path in tox
...
because of this commit [1] in ceph-ansible tests in ceph-volume needs to
be modified accordingly.
[1] 60d4b75f51
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2018-03-15 11:18:55 +01:00
Kefu Chai
2f05d2d399
Merge pull request #20836 from xiexingguo/wip-balancer-05
...
pybind/mgr/balancer: add sanity check against empty adjusted_map
Reviewed-by: Sage Weil <sage@redhat.com>
2018-03-15 14:28:46 +08:00
Kefu Chai
11531fe81c
Merge pull request #20857 from zealoussnow/wip-leozhang
...
osd/bluestore: delete unused variable in KernelDevice
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-03-15 14:27:36 +08:00
Kefu Chai
b1abdd48e6
Merge pull request #20690 from myoungwon/wip-manifest-num-counter
...
osd: add num_object_manifest
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-03-15 14:26:28 +08:00
Kefu Chai
2996068738
Merge pull request #20652 from shangfufei/wip-common
...
src/common: update some ms_* options to be more consistent
Reviewed-by: Haomai Wang <haomai@xsky.com>
2018-03-15 14:24:22 +08:00
Kefu Chai
5002840900
Merge pull request #20886 from liewegas/wip-kill-min-max
...
include: kill MIN and MAX macros
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2018-03-15 14:22:52 +08:00
Kefu Chai
e078ec6004
Merge pull request #20321 from jcsp/wip-22918
...
mgr: initialize PyModuleRegistry sooner
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-03-15 14:18:45 +08:00
Neha Ojha
939c9d03d6
PG: bug fix in is_degraded_or_backfilling_object()
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-14 15:56:05 -07:00
Neha Ojha
fa01affde1
PG: update pg_log missing for async_recovery_targets
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-14 15:56:05 -07:00
Neha Ojha
853655a559
PG: reset async_recovery_targets after recovery
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-14 15:56:05 -07:00
Neha Ojha
13d7093ec0
PG: call choose_acting when there are async_recovery_targets
...
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-03-14 15:56:05 -07:00