From: Greg Farnum <gfarnum@redhat.com>
Date: Mon, 14 Sep 2020 02:32:19 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master' into wip-stretch-mode
X-Git-Tag: v16.1.0~1053^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d02625331c4e06ca213d9720d98137d83a87cb90;p=ceph.git

Merge remote-tracking branch 'origin/master' into wip-stretch-mode
---

d02625331c4e06ca213d9720d98137d83a87cb90
diff --cc qa/tasks/ceph.py
index d3fb90ddd800,516f144aa457..035b2554651f
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@@ -547,9 -558,20 +569,21 @@@ def create_simple_monmap(ctx, remote, c
      monmap_output = remote.sh(args)
      fsid = re.search("generated fsid (.+)$",
                       monmap_output, re.MULTILINE).group(1)
 +    teuthology.delete_file(remote, tmp_conf_path)
      return fsid
  
+ 
+ def maybe_redirect_stderr(config, type_, args, log_path):
+     if type_ == 'osd' and \
+        config.get('flavor', 'default') == 'crimson':
+         # teuthworker uses ubuntu:ubuntu to access the test nodes
+         create_log_cmd = \
+             f'sudo install -b -o ubuntu -g ubuntu /dev/null {log_path}'
+         return create_log_cmd, args + [run.Raw('2>>'), log_path]
+     else:
+         return None, args
+ 
+ 
  @contextlib.contextmanager
  def cluster(ctx, config):
      """
diff --cc src/mon/MonMap.h
index e01d00e531b4,44009663edb2..c409ff9e112b
--- a/src/mon/MonMap.h
+++ b/src/mon/MonMap.h
@@@ -28,10 -28,9 +28,10 @@@
  #include "mon/mon_types.h"
  #include "msg/Message.h"
  
 +class health_check_map_t;
  
  #ifdef WITH_SEASTAR
- namespace ceph::common {
+ namespace crimson::common {
    class ConfigProxy;
  }
  #endif
@@@ -482,10 -454,20 +482,22 @@@ public
    void dump(ceph::Formatter *f) const;
    void dump_summary(ceph::Formatter *f) const;
  
 +  void check_health(health_check_map_t *checks) const;
 +
    static void generate_test_instances(std::list<MonMap*>& o);
  protected:
+   /**
+    * build a monmap from a list of entity_addrvec_t's
+    *
+    * Give mons dummy names.
+    *
+    * @param addrs  list of entity_addrvec_t's
+    * @param prefix prefix to prepend to generated mon names
+    * @return 0 for success, -errno on error
+    */
+   int init_with_addrs(const std::vector<entity_addrvec_t>& addrs,
+         bool for_mkfs,
+         std::string_view prefix);
    /**
     * build a monmap from a list of ips
     *
diff --cc src/osd/OSDMap.cc
index 73302d6fb142,e61780ccda2d..1ca5c7cfc8d5
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@@ -3360,10 -3301,10 +3360,10 @@@ void OSDMap::decode(ceph::buffer::list:
    }
  
    {
 -    DECODE_START(9, bl); // extended, osd-only data
 +    DECODE_START(10, bl); // extended, osd-only data
      decode(osd_addrs->hb_back_addrs, bl);
      decode(osd_info, bl);
-     decode(blacklist, bl);
+     decode(blocklist, bl);
      decode(osd_addrs->cluster_addrs, bl);
      decode(cluster_snapshot_epoch, bl);
      decode(cluster_snapshot, bl);
diff --cc src/osd/OSDMap.h
index 2e9dbcc8158e,2e0a3c8206fa..e0f496138c44
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@@ -640,12 -629,10 +640,12 @@@ private
  	     primary_temp(std::make_shared<mempool::osdmap::map<pg_t,int32_t>>()),
  	     osd_uuid(std::make_shared<mempool::osdmap::vector<uuid_d>>()),
  	     cluster_snapshot_epoch(0),
- 	     new_blacklist_entries(false),
+ 	     new_blocklist_entries(false),
  	     cached_up_osd_features(0),
  	     crc_defined(false), crc(0),
 -	     crush(std::make_shared<CrushWrapper>()) {
 +	     crush(std::make_shared<CrushWrapper>()),
 +	     stretch_mode_enabled(false), stretch_bucket_count(0),
 +	     degraded_stretch_mode(0), recovering_stretch_mode(0), stretch_mode_bucket(0) {
    }
  
  private: