Merge pull request #8558 from branch-predictor/bp-mark-down-on-perm-rst

msg: mark daemons down on RST + ECONNREFUSED

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/msg/DispatchQueue.h
index 2b366a03b5e99d4859e5a6240e6e682b0e638420,751282ec2d5a85c023a8f479bec58e676274d8a8..fd5ab092cc8eb6ffae9402dede53d0b98e4b340c
--- 1/src/msg/DispatchQueue.h
--- 2/src/msg/DispatchQueue.h
+++ b/src/msg/DispatchQueue.h
@@@ -88,9 -87,9 +88,9 @@@ class DispatchQueue 
      marrival_map.erase(i);
    }
  
 -  uint64_t next_id;
 +  std::atomic<uint64_t> next_id;
      
-   enum { D_CONNECT = 1, D_ACCEPT, D_BAD_REMOTE_RESET, D_BAD_RESET, D_NUM_CODES };
+   enum { D_CONNECT = 1, D_ACCEPT, D_BAD_REMOTE_RESET, D_BAD_RESET, D_CONN_REFUSED, D_NUM_CODES };
  
    /**
     * The DispatchThread runs dispatch_entry to empty out the dispatch_queue.

diff --cc src/osd/OSD.h
Simple merge

diff --cc src/osdc/Objecter.cc
Simple merge