From: Sage Weil <sage@redhat.com>
Date: Sun, 22 Sep 2019 18:39:15 +0000 (-0500)
Subject: common/ceph_context: make 'config unset' idempotent
X-Git-Tag: v15.1.0~1323^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9585dd0e0f72d0929cbd3632899c12ca3324ce3a;p=ceph-ci.git

common/ceph_context: make 'config unset' idempotent

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
index ca469f4c2cb..a03b61c69d1 100644
--- a/src/common/ceph_context.cc
+++ b/src/common/ceph_context.cc
@@ -535,6 +535,7 @@ int CephContext::_do_command(
 	     << cpp_strerror(r);
         } else {
           _conf.apply_changes(&ss);
+	  r = 0;
         }
       }