From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Thu, 30 Apr 2020 15:19:02 +0000 (+0200)
Subject: mgr/orch: scheduler: handle co-located daemons
X-Git-Tag: v16.1.0~2104^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=beb80c051cf40eecd8b501a9e0e86824d56007be;p=ceph.git

mgr/orch: scheduler: handle co-located daemons

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/src/pybind/mgr/cephadm/tests/test_scheduling.py b/src/pybind/mgr/cephadm/tests/test_scheduling.py
index f7f3480654c..bfe67eed81e 100644
--- a/src/pybind/mgr/cephadm/tests/test_scheduling.py
+++ b/src/pybind/mgr/cephadm/tests/test_scheduling.py
@@ -247,12 +247,14 @@ test_scheduler_daemons_results = [
     (k("123 123 1 1   *"), exactly('1')),
     (k("123 123 1 3   *"), exactly('3')),
     (k("123 123 1 12  *"), one_of('1', '2')),
+    (k("123 123 1 112 *"), one_of('1', '2')),
     (k("123 123 1 23  *"), one_of('2', '3')),
     (k("123 123 1 123 *"), one_of('1', '2', '3')),
     (k("123 123 2 e   *"), two_of('1', '2', '3')),
     (k("123 123 2 1   *"), _or(exactly('1', '2'), exactly('1', '3'))),
     (k("123 123 2 3   *"), _or(exactly('1', '3'), exactly('2', '3'))),
     (k("123 123 2 12  *"), exactly('1', '2')),
+    (k("123 123 2 112 *"), exactly('1', '2')),
     (k("123 123 2 23  *"), exactly('2', '3')),
     (k("123 123 2 123 *"), two_of('1', '2', '3')),
     (k("123 123 3 *   *"), exactly('1', '2', '3')),
@@ -271,6 +273,7 @@ test_scheduler_daemons_results = [
         ('1', ['1']),
         ('3', ['3']),
         ('12', ['1', '2']),
+        ('112', ['1', '1', '2']),  # deal with existing co-located daemons
         ('23', ['2', '3']),
         ('123', ['1', '2', '3']),
     ])