From: Matt Benjamin <mbenjamin@redhat.com>
Date: Wed, 9 Mar 2016 16:21:55 +0000 (-0500)
Subject: rgw: free components on shutdown
X-Git-Tag: v10.1.0~124^2~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a0a8dcc26cd98f6e4362aa4a4a7fe2144834e70b;p=ceph.git

rgw: free components on shutdown

Also, use ldout in rgw_file.h in 3 places.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
index 7e6a5fd81e3e6..4e71ee8659315 100644
--- a/src/rgw/librgw.cc
+++ b/src/rgw/librgw.cc
@@ -512,6 +512,8 @@ namespace rgw {
     fe->join();
 
     delete fe;
+    delete fec;
+    delete ldh;
 
     rgw_log_usage_finalize();
 
diff --git a/src/rgw/rgw_file.h b/src/rgw/rgw_file.h
index d7bda12f1d2d4..c5751b947dafd 100644
--- a/src/rgw/rgw_file.h
+++ b/src/rgw/rgw_file.h
@@ -674,7 +674,7 @@ namespace rgw {
 	  return -ERR_USER_SUSPENDED;
       } else {
 	/* try external authenticators (ldap for now) */
-	rgw::LDAPHelper* ldh = rgwlib.get_ldh();
+	rgw::LDAPHelper* ldh = rgwlib.get_ldh(); /* !nullptr */
 	RGWToken token{from_base64(key.id)};
 	if (ldh->auth(token.id, token.key) == 0) {
 	  /* try to store user if it doesn't already exist */
@@ -682,8 +682,9 @@ namespace rgw {
 	    int ret = rgw_store_user_info(store, user, NULL, NULL, 0,
 					  true);
 	    if (ret < 0) {
-	      dout(10) << "NOTICE: failed to store new user's info: ret=" << ret
-		       << dendl;
+	      lsubdout(get_context(), rgw, 10)
+		<< "NOTICE: failed to store new user's info: ret=" << ret
+		<< dendl;
 	    }
 	  }
 	} /* auth success */
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index abf84b2e86ee9..ceb379b4c0e89 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -1464,8 +1464,9 @@ int RGWPostObj_ObjStore_S3::get_policy()
 	if (rgw_get_user_info_by_uid(store, uid, user_info) < 0) {
 	  int ret = rgw_store_user_info(store, user_info, NULL, NULL, 0, true);
 	  if (ret < 0) {
-	    dout(10) << "NOTICE: failed to store new user's info: ret="
-		     << ret << dendl;
+	    ldout(store->ctx(), 10)
+	      << "NOTICE: failed to store new user's info: ret="
+	      << ret << dendl;
 	  }
 	  s->perm_mask = RGW_PERM_FULL_CONTROL;
 	}
@@ -1485,8 +1486,9 @@ int RGWPostObj_ObjStore_S3::get_policy()
 					user_info) < 0) {
 	  int ret = rgw_store_user_info(store, user_info, NULL, NULL, 0, true);
 	  if (ret < 0) {
-	    dout(10) << "NOTICE: failed to store new user's info: ret=" << ret
-		     << dendl;
+	    ldout(store->ctx(), 10)
+	      << "NOTICE: failed to store new user's info: ret=" << ret
+	      << dendl;
 	  }
 	  s->perm_mask = RGW_PERM_FULL_CONTROL;
 	}
diff --git a/src/test/Makefile-client.am b/src/test/Makefile-client.am
index b4cb16b580c3b..9ab749816762d 100644
--- a/src/test/Makefile-client.am
+++ b/src/test/Makefile-client.am
@@ -751,7 +751,7 @@ test_rgw_ldap_CXXFLAGS = $(UNITTEST_CXXFLAGS)
 test_rgw_ldap_LDADD = $(UNITTEST_LDADD) \
 	librados.la $(PTHREAD_LIBS) $(LIBOS) $(CEPH_GLOBAL) ${OPENLDAP_LIBS}
 	$(EXTRALIBS)
-bin_DEBUGPROGRAMS += test_rgw_token
+bin_DEBUGPROGRAMS += test_rgw_ldap
 
 endif # WITH_RADOSGW