From: John Spray <john.spray@redhat.com>
Date: Mon, 24 Jul 2017 12:19:06 +0000 (-0400)
Subject: common: reinstate freebsd ifdefs in options.cc
X-Git-Tag: v12.1.2~117^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=48aa368db9cd542590c09ca0f3095b99ffda7841;p=ceph.git

common: reinstate freebsd ifdefs in options.cc

The automated conversion missed these.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 7a333f01d1e8..c98bd30a9382 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -528,7 +528,15 @@ std::vector<Option> global_options = {
   .set_description(""),
 
   Option("keyring", Option::TYPE_STR, Option::LEVEL_ADVANCED)
-  .set_default("/etc/ceph/$cluster.$name.keyring,/etc/ceph/$cluster.keyring,/etc/ceph/keyring,/etc/ceph/keyring.bin,")
+  .set_default(
+    "/etc/ceph/$cluster.$name.keyring,/etc/ceph/$cluster.keyring,"
+    "/etc/ceph/keyring,/etc/ceph/keyring.bin," 
+#if defined(__FreeBSD)
+    "/usr/local/etc/ceph/$cluster.$name.keyring,"
+    "/usr/local/etc/ceph/$cluster.keyring,"
+    "/usr/local/etc/ceph/keyring,/usr/local/etc/ceph/keyring.bin," 
+#endif
+  )
   .set_description(""),
 
   Option("heartbeat_interval", Option::TYPE_INT, Option::LEVEL_ADVANCED)
@@ -621,11 +629,21 @@ std::vector<Option> global_options = {
   .set_description(""),
 
   Option("ms_bind_retry_count", Option::TYPE_INT, Option::LEVEL_ADVANCED)
+#if !defined(__FreeBSD__)
   .set_default(3)
+#else
+  // FreeBSD does not use SO_REAUSEADDR so allow for a bit more time per default
+  .set_default(6)
+#endif
   .set_description(""),
 
   Option("ms_bind_retry_delay", Option::TYPE_INT, Option::LEVEL_ADVANCED)
+#if !defined(__FreeBSD__)
   .set_default(5)
+#else
+  // FreeBSD does not use SO_REAUSEADDR so allow for a bit more time per default
+  .set_default(6)
+#endif
   .set_description(""),
 
   Option("ms_bind_before_connect", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
@@ -1646,11 +1664,15 @@ std::vector<Option> global_options = {
   .set_description(""),
 
   Option("osd_pool_default_erasure_code_profile", Option::TYPE_STR, Option::LEVEL_ADVANCED)
-  .set_default("plugin=jerasure " "technique=reed_sol_van " "k=2 " "m=1 ")
+  .set_default("plugin=jerasure technique=reed_sol_van k=2 m=1")
   .set_description(""),
 
   Option("osd_erasure_code_plugins", Option::TYPE_STR, Option::LEVEL_ADVANCED)
-  .set_default("jerasure" " lrc")
+  .set_default("jerasure lrc"
+#ifdef HAVE_BETTER_YASM_ELF64
+       " isa"
+#endif
+      )
   .set_description(""),
 
   Option("osd_allow_recovery_below_min_size", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)