From: Yuri Weinstein <yuri.weinstein@gmail.com>
Date: Sat, 17 Sep 2016 15:48:11 +0000 (-0700)
Subject: Merge pull request #8558 from branch-predictor/bp-mark-down-on-perm-rst
X-Git-Tag: v11.0.1~211
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a033dc6f5b4cef357db6f5951062d680e880ba0e;p=ceph.git

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>
---

a033dc6f5b4cef357db6f5951062d680e880ba0e
diff --cc src/msg/DispatchQueue.h
index 2b366a03b5e9,751282ec2d5a..fd5ab092cc8e
--- a/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.