Merge branch 'release/1.2.12'

leo-project · Jul 10, 2015 · fe10d3f · fe10d3f
2 parents f2793eb + 7c980cf
commit fe10d3f
Show file tree

Hide file tree

Showing 7 changed files with 125 additions and 76 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,54 @@
 CHANGELOG
 =========
 
+1.2.12 (July 10, 2015)
+======================
+
+* Improvemens
+    * Able to use ``compact-suspend`` comamnd when the auto-compaction is enabled
+* Fixed Bugs
+    * [#390](https://github.com/leo-project/leofs/issues/390) ``leo_object_storage`` Unexpected 500 error when getting a zero size object not cached
+    * [#393](https://github.com/leo-project/leofs/issues/393) ``leo_object_storage`` Compaction can be slow because of the watchdog communication
+    * [#395](https://github.com/leo-project/leofs/issues/395) ``leo_gateway`` ``s3tests.functional.test_s3:test_bucket_list_maxkeys_zero`` failed
+    * [#396](https://github.com/leo-project/leofs/issues/396) ``leo_storage`` Auto Compaction tend to be executed on the same node
+    * [#398](https://github.com/leo-project/leofs/issues/398) ``leo_object_storage`` Compaction may stop unintentionally under heavy load
+
+* Used libraries
+    * leo project
+        * [leo_backend-db v1.1.9](https://github.com/leo-project/leo_backend_db/releases/tag/1.1.9)
+        * [leo_cache v0.6.5](https://github.com/leo-project/leo_cache/releases/tag/0.6.5)
+        * [leo_commons v1.1.2](https://github.com/leo-project/leo_commons/releases/tag/1.1.2)
+        * [leo_dcerl v0.4.0](https://github.com/leo-project/leo_dcerl/releases/tag/0.4.0)
+        * [leo_logger v1.1.6](https://github.com/leo-project/leo_logger/releases/tag/1.1.6)
+        * [leo_mcerl v0.6.0](https://github.com/leo-project/leo_mcerl/releases/tag/0.6.0)
+        * [leo_mq v1.3.11](https://github.com/leo-project/leo_mq/releases/tag/1.3.11)
+        * [leo_object_storage v1.2.9](https://github.com/leo-project/leo_object_storage/releases/tag/1.2.9)
+        * [leo_ordning_reda v1.1.0](https://github.com/leo-project/leo_ordning_reda/releases/tag/1.1.0)
+        * [leo_redundant_manager 1.9.15](https://github.com/leo-project/leo_redundant_manager/releases/tag/1.9.15)
+        * [leo_rpc v0.10.2](https://github.com/leo-project/leo_rpc/releases/tag/0.10.2)
+        * [leo_pod v0.6.4](https://github.com/leo-project/leo_pod/releases/tag/0.6.4)
+        * [leo_s3_libs v1.1.8](https://github.com/leo-project/leo_s3_libs/releases/tag/1.1.8)
+        * [leo_statistics v1.1.6](https://github.com/leo-project/leo_statistics/releases/tag/1.1.6)
+        * [leo_watchdog v0.10.2](https://github.com/leo-project/leo_watchdog/releases/tag/0.10.2)
+        * [savanna_agent v0.4.9](https://github.com/leo-project/savanna_agent/releases/tag/0.4.9)
+        * [savanna_commons v0.8.12](https://github.com/leo-project/savanna_commons/releases/tag/0.8.12)
+        * [erpcgen v0.2.3](https://github.com/leo-project/erpcgen/releases/tag/0.2.3)
+        * [nfs_rpc_server v0.2.3](https://github.com/leo-project/nfs_rpc_server/releases/tag/0.2.3)
+        * [leo_gateway v1.2.12](https://github.com/leo-project/leo_gateway/releases/tag/1.2.12)
+        * [leo_manager v1.2.12](https://github.com/leo-project/leo_manager/releases/tag/1.2.12)
+        * [leo_storage v1.2.12](https://github.com/leo-project/leo_storage/releases/tag/1.2.12)
+    * others
+        * [bitcask v2.0.0](https://github.com/lbasho/bitcask/releases/tag/2.0.0)
+        * [cowboy v1.0.1](https://github.com/leo-project/cowboy/releases/tag/for-leofs-1.2.11)
+        * [cowlib v1.0.0](https://github.com/extend/cowboy/releases/tag/1.0.0)
+        * [elarm v0.3.0](https://github.com/leo-project/elarm/releases/tag/0.3.0)
+        * [eleveldb v2.1.1](https://github.com/basho/eleveldb/releases/tag/2.1.1)
+        * [folsom v0.8.2-for-leofs](https://github.com/leo-project/folsom/releases/tag/0.8.2-for-leofs)
+        * [jiffy v0.13.3](https://github.com/davisp/jiffy/releases/tag/0.13.3)
+        * [lz4 v0.2.2](https://github.com/leo-project/erlang-lz4/releases/tag/0.2.2)
+        * [recon v0.8.5](https://github.com/ferd/recon/releases/tag/2.2.1)
+
+
 1.2.11 (June 30, 2015)
 ======================
 

diff --git a/leofs.mk b/leofs.mk
@@ -1 +1 @@
-LEOFS_VERSION=1.2.11
+LEOFS_VERSION=1.2.12
diff --git a/pkg/leo_gateway/files/leo_gateway.conf b/pkg/leo_gateway/files/leo_gateway.conf
@@ -181,10 +181,10 @@ watchdog.rex.threshold_mem_capacity = 33554432
 ## watchdog.cpu.is_enabled = true
 
 ## cpu - raised error times
-## watchdog.cpu.raised_error_times = 3
+## watchdog.cpu.raised_error_times = 5
 
 ## cpu - watch interval - default:5sec
-## watchdog.cpu.interval = 5
+## watchdog.cpu.interval = 10
 
 ## Threshold CPU load avg for 1min/5min - default:5.0
 ## watchdog.cpu.threshold_cpu_load_avg = 5.0
@@ -193,22 +193,6 @@ watchdog.rex.threshold_mem_capacity = 33554432
 ## watchdog.cpu.threshold_cpu_util = 100
 
 
-##
-##  Watchdog.Erlang IO
-##
-## Is io-watchdog enabled - default:false
-## watchdog.io.is_enabled = true
-
-## io - watch interval - default:1sec
-## watchdog.io.interval = 1
-
-## Threshold input size/sec  - default:128MB/sec
-## watchdog.io.threshold_input_per_sec = 134217728
-
-## Threshold output size/sec - default:128MB/sec
-## watchdog.io.threshold_output_per_sec = 134217728
-
-
 ## --------------------------------------------------------------------
 ## GATEWAY - Timeout
 ## --------------------------------------------------------------------

diff --git a/pkg/leo_storage/files/leo_storage.conf b/pkg/leo_storage/files/leo_storage.conf
@@ -83,10 +83,10 @@ watchdog.rex.threshold_mem_capacity = 33554432
 ## watchdog.cpu.is_enabled = true
 
 ## cpu - raised error times
-## watchdog.cpu.raised_error_times = 3
+## watchdog.cpu.raised_error_times = 5
 
 ## cpu - watch interval - default:5sec
-## watchdog.cpu.interval = 5
+## watchdog.cpu.interval = 10
 
 ## Threshold CPU load avg for 1min/5min - default:5.0
 ## watchdog.cpu.threshold_cpu_load_avg = 5.0
@@ -95,33 +95,17 @@ watchdog.rex.threshold_mem_capacity = 33554432
 ## watchdog.cpu.threshold_cpu_util = 100
 
 
-##
-##  Watchdog.IO
-##
-## Is io-watchdog enabled - default:false
-## watchdog.io.is_enabled = true
-
-## io - watch interval - default:1sec
-## watchdog.io.interval = 1
-
-## Threshold input size/sec  - default:134217728(B) - 128MB/sec
-## watchdog.io.threshold_input_per_sec = 134217728
-
-## Threshold output size/sec - default:134217728(B) - 128MB/sec
-## watchdog.io.threshold_output_per_sec = 134217728
-
-
 ##
 ##  Watchdog.DISK
 ##
 ## Is disk-watchdog enabled - default:false
 ## watchdog.disk.is_enabled = true
 
 ## disk - raised error times
-## watchdog.disk.raised_error_times = 3
+## watchdog.disk.raised_error_times = 5
 
 ## disk - watch interval - default:1sec
-## watchdog.disk.interval = 1
+## watchdog.disk.interval = 10
 
 ## Threshold disk use% - defalut:85%
 ## watchdog.disk.threshold_disk_use = 85
@@ -173,30 +157,18 @@ watchdog.rex.threshold_mem_capacity = 33554432
 ## Limit of a number of procs to execute data-compaction in parallel
 ##compaction.limit_num_of_compaction_procs = 4
 
-## Minimum value of compaction-proc waiting time/batch-proc(msec)
-##compaction.waiting_time_min = 100
-
 ## Regular value of compaction-proc waiting time/batch-proc(msec)
-##compaction.waiting_time_regular = 300
+##compaction.waiting_time_regular = 500
 
 ## Maximum value of compaction-proc waiting time/batch-proc(msec)
-##compaction.waiting_time_max = 1000
+##compaction.waiting_time_max = 3000
 
-## Step of compaction-proc waiting time(msec)
-##compaction.waiting_time_step = 100
-
-
-## Minimum compaction batch processes
-##compaction.batch_procs_min = 1000
 
 ## Regular compaction batch processes
-##compaction.batch_procs_regular = 10000
+##compaction.batch_procs_regular = 1000
 
 ## Maximum compaction batch processes
-##compaction.batch_procs_max = 100000
-
-## Step compaction batch processes
-##compaction.batch_procs_step = 1000
+##compaction.batch_procs_max = 1500
 
 
 ## --------------------------------------------------------------------
@@ -211,33 +183,21 @@ watchdog.rex.threshold_mem_capacity = 33554432
 ##
 ## [Number of bach processes of message]
 ##
-## Minimum number of bach processes of message
-mq.num_of_batch_process_min = 100
-
 ## Maximum number of bach processes of message
-mq.num_of_batch_process_max = 10000
+mq.num_of_batch_process_max = 3000
 
 ## Regular value of bach processes of message
-mq.num_of_batch_process_regular = 1000
-
-## Step value of bach processes of message
-mq.num_of_batch_process_step = 250
+mq.num_of_batch_process_regular = 1600
 
 
 ##
 ## [Interval beween batch-procs]
 ##
-## Minimum value of interval beween batch-procs(msec)
-mq.interval_between_batch_procs_min = 10
-
 ## Maximum value of interval between batch-procs(msec)
-mq.interval_between_batch_procs_max = 1000
+mq.interval_between_batch_procs_max = 3000
 
 ## Regular value of interval between batch-procs(msec)
-mq.interval_between_batch_procs_regular = 300
-
-## Step value of interval between batch-procs(msec)
-mq.interval_between_batch_procs_step = 100
+mq.interval_between_batch_procs_regular = 500
 
 
 ## --------------------------------------------------------------------

diff --git a/rebar.config b/rebar.config
@@ -23,9 +23,9 @@
 {require_otp_vsn, "R16B*|17"}.
 
 {deps, [
-        {leo_manager, ".*", {git, "https://github.com/leo-project/leo_manager.git", {tag, "1.2.11"}}},
-        {leo_storage, ".*", {git, "https://github.com/leo-project/leo_storage.git", {tag, "1.2.11"}}},
-        {leo_gateway, ".*", {git, "https://github.com/leo-project/leo_gateway.git", {tag, "1.2.11"}}},
+        {leo_manager, ".*", {git, "https://github.com/leo-project/leo_manager.git", {tag, "1.2.12"}}},
+        {leo_storage, ".*", {git, "https://github.com/leo-project/leo_storage.git", {tag, "1.2.12"}}},
+        {leo_gateway, ".*", {git, "https://github.com/leo-project/leo_gateway.git", {tag, "1.2.12"}}},
         {fifo_utils, "0.1.*", {git, "https://github.com/project-fifo/fifo_utils.git", {tag, "0.1.8"}}}
        ]}.
 

diff --git a/releasenotes/leofs-1.2.md b/releasenotes/leofs-1.2.md
@@ -1,3 +1,58 @@
+1.2.12
+======
+
+Features and Improvements for LeoFS
+-----------------------------------
+
+* Able to use ``compact-suspend`` comamnd when the auto-compaction is enabled
+
+Bugs Fixed
+-----------
+
+* [#390](https://github.com/leo-project/leofs/issues/390) ``leo_object_storage`` Unexpected 500 error when getting a zero size object not cached
+* [#393](https://github.com/leo-project/leofs/issues/393) ``leo_object_storage`` Compaction can be slow because of the watchdog communication
+* [#395](https://github.com/leo-project/leofs/issues/395) ``leo_gateway`` ``s3tests.functional.test_s3:test_bucket_list_maxkeys_zero`` failed
+* [#396](https://github.com/leo-project/leofs/issues/396) ``leo_storage`` Auto Compaction tend to be executed on the same node
+* [#398](https://github.com/leo-project/leofs/issues/398) ``leo_object_storage`` Compaction may stop unintentionally under heavy load
+
+Used Libraries
+---------------
+
+* leo project
+    * [leo_backend-db v1.1.9](https://github.com/leo-project/leo_backend_db/releases/tag/1.1.9)
+    * [leo_cache v0.6.5](https://github.com/leo-project/leo_cache/releases/tag/0.6.5)
+    * [leo_commons v1.1.2](https://github.com/leo-project/leo_commons/releases/tag/1.1.2)
+    * [leo_dcerl v0.4.0](https://github.com/leo-project/leo_dcerl/releases/tag/0.4.0)
+    * [leo_logger v1.1.6](https://github.com/leo-project/leo_logger/releases/tag/1.1.6)
+    * [leo_mcerl v0.6.0](https://github.com/leo-project/leo_mcerl/releases/tag/0.6.0)
+    * [leo_mq v1.3.11](https://github.com/leo-project/leo_mq/releases/tag/1.3.11)
+    * [leo_object_storage v1.2.9](https://github.com/leo-project/leo_object_storage/releases/tag/1.2.9)
+    * [leo_ordning_reda v1.1.0](https://github.com/leo-project/leo_ordning_reda/releases/tag/1.1.0)
+    * [leo_redundant_manager 1.9.15](https://github.com/leo-project/leo_redundant_manager/releases/tag/1.9.15)
+    * [leo_rpc v0.10.2](https://github.com/leo-project/leo_rpc/releases/tag/0.10.2)
+    * [leo_pod v0.6.4](https://github.com/leo-project/leo_pod/releases/tag/0.6.4)
+    * [leo_s3_libs v1.1.8](https://github.com/leo-project/leo_s3_libs/releases/tag/1.1.8)
+    * [leo_statistics v1.1.6](https://github.com/leo-project/leo_statistics/releases/tag/1.1.6)
+    * [leo_watchdog v0.10.2](https://github.com/leo-project/leo_watchdog/releases/tag/0.10.2)
+    * [savanna_agent v0.4.9](https://github.com/leo-project/savanna_agent/releases/tag/0.4.9)
+    * [savanna_commons v0.8.12](https://github.com/leo-project/savanna_commons/releases/tag/0.8.12)
+    * [erpcgen v0.2.3](https://github.com/leo-project/erpcgen/releases/tag/0.2.3)
+    * [nfs_rpc_server v0.2.3](https://github.com/leo-project/nfs_rpc_server/releases/tag/0.2.3)
+    * [leo_gateway v1.2.12](https://github.com/leo-project/leo_gateway/releases/tag/1.2.12)
+    * [leo_manager v1.2.12](https://github.com/leo-project/leo_manager/releases/tag/1.2.12)
+    * [leo_storage v1.2.12](https://github.com/leo-project/leo_storage/releases/tag/1.2.12)
+* others
+    * [bitcask v2.0.0](https://github.com/lbasho/bitcask/releases/tag/2.0.0)
+    * [cowboy v1.0.1](https://github.com/leo-project/cowboy/releases/tag/for-leofs-1.2.11)
+    * [cowlib v1.0.0](https://github.com/extend/cowboy/releases/tag/1.0.0)
+    * [elarm v0.3.0](https://github.com/leo-project/elarm/releases/tag/0.3.0)
+    * [eleveldb v2.1.1](https://github.com/basho/eleveldb/releases/tag/2.1.1)
+    * [folsom v0.8.2-for-leofs](https://github.com/leo-project/folsom/releases/tag/0.8.2-for-leofs)
+    * [jiffy v0.13.3](https://github.com/davisp/jiffy/releases/tag/0.13.3)
+    * [lz4 v0.2.2](https://github.com/leo-project/erlang-lz4/releases/tag/0.2.2)
+    * [recon v0.8.5](https://github.com/ferd/recon/releases/tag/2.2.1)
+
+
 1.2.11
 ======
 

diff --git a/test/src/basho_bench_driver_leofs.erl b/test/src/basho_bench_driver_leofs.erl
@@ -391,9 +391,11 @@ send_request(Url, Headers, Method, Body, Options) ->
 send_request(_Url, _Headers, _Method, _Body, _Options, 0) ->
     {error, max_retries};
 send_request(Url, Headers, Method, Body, Options, Count) ->
+    Date = httpd_util:rfc1123_date(),
+    Headers2 = [{'Date', Date}|Headers],
     Pid = connect(Url),
     case catch(ibrowse_http_client:send_req(
-                 Pid, Url, Headers, Method, Body, Options,
+                 Pid, Url, Headers2, Method, Body, Options,
                  basho_bench_config:get(http_raw_request_timeout, 5000))) of
 
         {ok, Status, RespHeaders, RespBody} ->
@@ -405,7 +407,7 @@ send_request(Url, Headers, Method, Body, Options, Count) ->
             disconnect(Url),
             case should_retry(Error) of
                 true ->
-                    send_request(Url, Headers, Method, Body, Options, Count-1);
+                    send_request(Url, Headers2, Method, Body, Options, Count-1);
 
                 false ->
                     normalize_error(Method, Error)