* rrd_open: rrd_close does not purge file from cache

[rrdtool.git] / src / rrd_tune.c

diff --git a/src/rrd_tune.c b/src/rrd_tune.c
index 91f6409..f675c8b 100644 (file)
--- a/src/rrd_tune.c
+++ b/src/rrd_tune.c
@@ -72,6 +72,24 @@ int rrd_tune(
     double    max;
     char      dst[DST_SIZE];
     rrd_file_t *rrd_file;
+    struct option long_options[] = {
+        {"heartbeat", required_argument, 0, 'h'},
+        {"minimum", required_argument, 0, 'i'},
+        {"maximum", required_argument, 0, 'a'},
+        {"data-source-type", required_argument, 0, 'd'},
+        {"data-source-rename", required_argument, 0, 'r'},
+        /* added parameter tuning options for aberrant behavior detection */
+        {"deltapos", required_argument, 0, 'p'},
+        {"deltaneg", required_argument, 0, 'n'},
+        {"window-length", required_argument, 0, 'w'},
+        {"failure-threshold", required_argument, 0, 'f'},
+        {"alpha", required_argument, 0, 'x'},
+        {"beta", required_argument, 0, 'y'},
+        {"gamma", required_argument, 0, 'z'},
+        {"gamma-deviation", required_argument, 0, 'v'},
+        {"aberrant-reset", required_argument, 0, 'b'},
+        {0, 0, 0, 0}
+    };
 
     optind = 0;
     opterr = 0;         /* initialize getopt */
@@ -84,24 +102,6 @@ int rrd_tune(
     }
 
     while (1) {
-        static struct option long_options[] = {
-            {"heartbeat", required_argument, 0, 'h'},
-            {"minimum", required_argument, 0, 'i'},
-            {"maximum", required_argument, 0, 'a'},
-            {"data-source-type", required_argument, 0, 'd'},
-            {"data-source-rename", required_argument, 0, 'r'},
-            /* added parameter tuning options for aberrant behavior detection */
-            {"deltapos", required_argument, 0, 'p'},
-            {"deltaneg", required_argument, 0, 'n'},
-            {"window-length", required_argument, 0, 'w'},
-            {"failure-threshold", required_argument, 0, 'f'},
-            {"alpha", required_argument, 0, 'x'},
-            {"beta", required_argument, 0, 'y'},
-            {"gamma", required_argument, 0, 'z'},
-            {"gamma-deviation", required_argument, 0, 'v'},
-            {"aberrant-reset", required_argument, 0, 'b'},
-            {0, 0, 0, 0}
-        };
         int       option_index = 0;
         int       opt;
 
@@ -237,14 +237,20 @@ int rrd_tune(
             break;
         case 'x':
             if (set_hwarg(&rrd, CF_HWPREDICT, RRA_hw_alpha, optarg)) {
-                rrd_free(&rrd);
-                return -1;
+                if (set_hwarg(&rrd, CF_MHWPREDICT, RRA_hw_alpha, optarg)) {
+                    rrd_free(&rrd);
+                    return -1;
+                }
+                rrd_clear_error();
             }
             break;
         case 'y':
             if (set_hwarg(&rrd, CF_HWPREDICT, RRA_hw_beta, optarg)) {
-                rrd_free(&rrd);
-                return -1;
+                if (set_hwarg(&rrd, CF_MHWPREDICT, RRA_hw_beta, optarg)) {
+                    rrd_free(&rrd);
+                    return -1;
+                }
+                rrd_clear_error();
             }
             break;
         case 'z':