From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 20 Jul 2020 16:57:57 +0000 (-0400)
Subject: common/options: changed default immutable object cache path
X-Git-Tag: v15.2.5~62^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50c903b730ade69640ef0c11c8e4edbaa7a19107;p=ceph.git

common/options: changed default immutable object cache path

Switch the default path for the immutable object cache from "/tmp" to
"/tmp/ceph_immutable_object_cache" to prevent the deletion of all
files in the "/tmp" directory and sub-directories for unconfigured
daemons.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit eeecc1860f81129347c648a6cbd4a8a78ff4c636)
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 3dac60ea5e3..a49d0f7d763 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -7596,7 +7596,7 @@ static std::vector<Option> get_rbd_mirror_options() {
 static std::vector<Option> get_immutable_object_cache_options() {
   return std::vector<Option>({
     Option("immutable_object_cache_path", Option::TYPE_STR, Option::LEVEL_ADVANCED)
-    .set_default("/tmp")
+    .set_default("/tmp/ceph_immutable_object_cache")
     .set_description("immutable object cache data dir"),
 
     Option("immutable_object_cache_sock", Option::TYPE_STR, Option::LEVEL_ADVANCED)