From 061f28c6eb540b219253e68216a6ba5f702c8a40 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Piotr=20Da=C5=82ek?= <piotr.dalek@corp.ovh.com>
Date: Thu, 12 Apr 2018 13:09:42 +0200
Subject: [PATCH] options: add bounds and description to osd heartbeat interval
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Previously this var was unbounded, meaning that rogue injectargs
could kill the cluster. Also, add a description to it and to
osd_heartbeat_min_size.

Signed-off-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
---
 src/common/options.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common/options.cc b/src/common/options.cc
index fb6914d0dda6..06100b589ce5 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -2862,7 +2862,8 @@ std::vector<Option> get_global_options() {
 
     Option("osd_heartbeat_interval", Option::TYPE_INT, Option::LEVEL_ADVANCED)
     .set_default(6)
-    .set_description(""),
+    .set_min_max(1, 86400)
+    .set_description("Interval (in seconds) between peer pings"),
 
     Option("osd_heartbeat_grace", Option::TYPE_INT, Option::LEVEL_ADVANCED)
     .set_default(20)
@@ -2878,7 +2879,7 @@ std::vector<Option> get_global_options() {
 
     Option("osd_heartbeat_min_size", Option::TYPE_INT, Option::LEVEL_ADVANCED)
     .set_default(2000)
-    .set_description(""),
+    .set_description("Minimum heartbeat packet size in bytes. Will add dummy payload if heartbeat packet is smaller than this."),
 
     Option("osd_pg_max_concurrent_snap_trims", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
     .set_default(2)
-- 
2.47.3