Merge branch 'release/1.2.22'

CHANGELOG.md

@@ -1,4 +1,44 @@
 # CHANGELOG
+## 1.2.22 (May 20, 2016)
+* Improvements
+    * [#472](https://github.com/leo-project/leofs/issues/472) ``leo_storage`` Possibility to become imbalance of a total mq's msgs during a rebalance (detach-node)
+    * [#473](https://github.com/leo-project/leofs/issues/473) ``leo_manager`` Enforced **"-smp enabled"** by default
+    * [#474](https://github.com/leo-project/leofs/issues/474) ``leo_storage`` Improved the performance of the recover-node
+
+* Used libraries
+    * leo project
+        * [leo_backend-db v1.2.2](https://github.com/leo-project/leo_backend_db/releases/tag/1.2.2)
+        * [leo_cache v0.6.14](https://github.com/leo-project/leo_cache/releases/tag/0.6.14)
+        * [leo_commons v1.1.6](https://github.com/leo-project/leo_commons/releases/tag/1.1.6)
+        * [leo_dcerl v0.4.4](https://github.com/leo-project/leo_dcerl/releases/tag/0.4.4)
+        * [leo_logger v1.2.2](https://github.com/leo-project/leo_logger/releases/tag/1.2.2)
+        * [leo_mcerl v0.6.2](https://github.com/leo-project/leo_mcerl/releases/tag/0.6.2)
+        * [leo_mq v1.4.2](https://github.com/leo-project/leo_mq/releases/tag/1.4.5)
+        * [leo_object_storage v1.2.22](https://github.com/leo-project/leo_object_storage/releases/tag/1.2.22)
+        * [leo_ordning_reda v1.2.0](https://github.com/leo-project/leo_ordning_reda/releases/tag/1.2.0)
+        * [leo_redundant_manager 1.9.26](https://github.com/leo-project/leo_redundant_manager/releases/tag/1.9.26)
+        * [leo_rpc v0.10.8](https://github.com/leo-project/leo_rpc/releases/tag/0.10.8)
+        * [leo_pod v0.6.6](https://github.com/leo-project/leo_pod/releases/tag/0.6.6)
+        * [leo_s3_libs v1.1.13](https://github.com/leo-project/leo_s3_libs/releases/tag/1.1.13)
+        * [leo_statistics v1.1.12](https://github.com/leo-project/leo_statistics/releases/tag/1.1.12)
+        * [leo_watchdog v0.12.2](https://github.com/leo-project/leo_watchdog/releases/tag/0.12.2)
+        * [savanna_agent v0.4.15](https://github.com/leo-project/savanna_agent/releases/tag/0.4.15)
+        * [savanna_commons v0.10.1](https://github.com/leo-project/savanna_commons/releases/tag/0.10.1)
+        * [erpcgen v0.2.4](https://github.com/leo-project/erpcgen/releases/tag/0.2.4)
+        * [nfs_rpc_server v0.2.4](https://github.com/leo-project/nfs_rpc_server/releases/tag/0.2.4)
+        * [leo_gateway v1.2.22](https://github.com/leo-project/leo_gateway/releases/tag/1.2.22)
+        * [leo_manager v1.2.22](https://github.com/leo-project/leo_manager/releases/tag/1.2.22)
+        * [leo_storage v1.2.22](https://github.com/leo-project/leo_storage/releases/tag/1.2.22)
+    * others
+        * [bitcask v2.0.1](https://github.com/basho/bitcask/releases/tag/2.0.1)
+        * [cowboy v1.0.0](https://github.com/leo-project/cowboy/releases/tag/1.0.0-p1)
+        * [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.10](https://github.com/basho/eleveldb/releases/tag/2.1.10)
+        * [folsom v0.8.2-for-leofs](https://github.com/leo-project/folsom/releases/tag/0.8.2-for-leofs)
+        * [jiffy v0.14.7](https://github.com/davisp/jiffy/releases/tag/0.14.7)
+        * [recon v0.8.5](https://github.com/ferd/recon/releases/tag/2.2.1)
+
 ## 1.2.21 (March 29, 2016)
 
 * Fixed Bugs

README.md

@@ -1,5 +1,7 @@
 # LeoFS - The Lion of Storage Systems
 
+[![Join the chat at https://gitter.im/leo-project/leofs](https://badges.gitter.im/leo-project/leofs.svg)](https://gitter.im/leo-project/leofs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 ![LeoFS Logo](http://leo-project.net/leofs/docs/_static/leofs-logo-small.png)
 
 ## Overview
@@ -266,14 +268,14 @@ We're able to easily check LeoFS with <a target="_blank" href="https://github.co
     * Increase compatibility S3-APIs#5
         * Other bucket operations
 * *DONE* - v1.1
-    * NFS Support *(alpha)*
+    * NFS v3 Support *(alpha)*
     * Improve Web GUI Console (Option)
 * *DONE* - v1.2
-    * NFS Support *(beta)*
+    * NFS v3 Support *(beta)*
     * Watchdog
     * Auto-compaction
 * *On Going* - v1.4
-    * NFS Support *(stable)*
+    * NFS v3 Support *(stable)*
         * Improve performance of the list objects
         * NFS lock-option support
     * Erasure Code
@@ -283,9 +285,9 @@ We're able to easily check LeoFS with <a target="_blank" href="https://github.co
         * Objects Expiration into a bucket
         * Versioning
 * v2.0
-    * NFS Support
+    * NFS v4 Support
+    * Data Deduplication
     * QoS Support *(Option)*
-    * Erasure Coding
     * Improve compatibility S3-APIs#7
 
 

leofs.mk

@@ -1 +1 @@
-LEOFS_VERSION=1.2.21
+LEOFS_VERSION=1.2.22

pkg/leo_gateway/Makefile

@@ -28,5 +28,6 @@ prepare:
 	cp files/leo_gateway_snmp.config.1 $(DIR)/snmp/snmpa_gateway_1/leo_gateway_snmp.config
 
 clean: clean-pkg
+	-rm $(STAGE_DIR)/sbin/leofs-adm
 	-rm -r $(DIR)
 	-rm *.tgz

pkg/leo_gateway/files/leo_gateway.conf

@@ -50,7 +50,7 @@ protocol = s3
 ## GATEWAY - HTTP-related configurations
 ## --------------------------------------------------------------------
 ## Port number the Gateway uses for HTTP connections
-http.port = 8080
+http.port = 80
 
 ## Numbers of processes listening for connections
 http.num_of_acceptors = 128
@@ -62,13 +62,13 @@ http.max_keepalive = 4096
 ## http.layer_of_dirs = 12
 
 ## Port number the Gateway uses for HTTPS connections
-## http.ssl_port     = 8443
+http.ssl_port     = 443
 
 ## SSL Certificate file
-## http.ssl_certfile = ./etc/server_cert.pem
+http.ssl_certfile = ./etc/server_cert.pem
 
 ## SSL key
-## http.ssl_keyfile  = ./etc/server_key.pem
+http.ssl_keyfile  = ./etc/server_key.pem
 
 ## HTTP custom header configuration file path
 ## http.headers_config_file = ./etc/http_custom_header.conf
@@ -98,7 +98,6 @@ bucket_prop_sync_interval = 300
 ## NFSd's the number of acceptors
 ## nfs.nfsd.acceptors = 128
 
-
 ## --------------------------------------------------------------------
 ## GATEWAY - Large Object
 ## --------------------------------------------------------------------
@@ -194,6 +193,22 @@ 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
 ## --------------------------------------------------------------------
@@ -242,7 +257,6 @@ log.member_dir = /var/log/leo_gateway/ring
 ## Output log file(s) - ring
 log.ring_dir = /var/log/leo_gateway/ring
 
-
 ## --------------------------------------------------------------------
 ## GATEWAY - Other Directories
 ## --------------------------------------------------------------------
@@ -335,4 +349,4 @@ erlang.secio = false
 process_limit = 1048576
 
 ## Path of SNMP-agent configuration
-##snmp_conf = ./snmp/snmpa_gateway_0/leo_gateway_snmp
+## snmp_conf = ./snmp/snmpa_gateway_0/leo_gateway_snmp

pkg/leo_manager/Makefile

@@ -18,14 +18,16 @@ all: package
 package: prepare $(FILE).tgz
 
 prepare:
-	cp ../../leofs-adm $(STAGE_DIR)/sbin
+	-rm -r $(DIR) || true
 	cp -r $(COMPONENT_PATH) $(DIR)
+	mkdir $(DIR)/share
+	cp ../../leofs-adm $(STAGE_DIR)/sbin
+	cp files/$(COMPONENT).xml $(DIR)/share
 	cp files/start $(DIR)/erts-*/bin/start
-	cp files/leo_manager.conf* $(DIR)/etc/
+	rm $(DIR)/etc/leo_manager.conf || true
+	cp files/leo_manager.conf.master $(DIR)/etc/leo_manager.conf.example
 	cp files/leo_manager_snmp.config $(DIR)/snmp/snmpa_manager_0/
 	cp files/leo_manager_snmp.config $(DIR)/snmp/snmpa_manager_1/
-	rm $(DIR)/etc/leo_manager.conf
-	cp files/leo_manager.conf.master $(DIR)/etc/leo_manager.conf.example
 
 clean: clean-pkg
 	-rm $(STAGE_DIR)/sbin/leofs-adm

pkg/leo_manager/files/leo_manager.conf.master

@@ -35,6 +35,9 @@ sasl.error_logger_mf_dir = /var/log/leo_manager/sasl
 ## --------------------------------------------------------------------
 ## MANAGER
 ## --------------------------------------------------------------------
+## Mode of Manager: [master|slave]
+manager.mode = master
+
 ## Partner of manager's alias
 manager.partner = [email protected]
 

pkg/leo_manager/files/leo_manager.conf.slave

@@ -35,6 +35,9 @@ sasl.error_logger_mf_dir = /var/log/leo_manager/sasl
 ## --------------------------------------------------------------------
 ## MANAGER
 ## --------------------------------------------------------------------
+## Mode of Manager: [master|slave]
+manager.mode = slave
+
 ## Partner of manager's alias
 manager.partner = [email protected]
 

pkg/leo_storage/files/leo_storage.conf

@@ -74,7 +74,6 @@ obj_containers.num_of_containers = [8]
 ## since v1.2.20
 ## num_of_obj_storage_read_procs = 3
 
-
 ## --------------------------------------------------------------------
 ## STORAGE - Watchdog
 ## --------------------------------------------------------------------
@@ -95,13 +94,13 @@ watchdog.rex.threshold_mem_capacity = 33554432
 ##  Watchdog.CPU
 ##
 ## Is cpu-watchdog enabled - default:false
-## watchdog.cpu.is_enabled = false
+## watchdog.cpu.is_enabled = true
 
 ## cpu - raised error times
-## watchdog.cpu.raised_error_times = 5
+## watchdog.cpu.raised_error_times = 3
 
 ## cpu - watch interval - default:5sec
-## watchdog.cpu.interval = 10
+## watchdog.cpu.interval = 5
 
 ## Threshold CPU load avg for 1min/5min - default:5.0
 ## watchdog.cpu.threshold_cpu_load_avg = 5.0
@@ -110,34 +109,49 @@ 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 = false
+## watchdog.disk.is_enabled = true
 
 ## disk - raised error times
-## watchdog.disk.raised_error_times = 5
+## watchdog.disk.raised_error_times = 3
 
 ## disk - watch interval - default:1sec
-## watchdog.disk.interval = 10
+## watchdog.disk.interval = 1
 
-## Threshold use(%) of a target disk's capacity - defalut:85%
+## Threshold disk use% - defalut:85%
 ## watchdog.disk.threshold_disk_use = 85
 
-## Threshold disk utilization(%) - defalut:90%
-## watchdog.disk.threshold_disk_util = 90
+## Threshold disk util% - defalut:100%
+## watchdog.disk.threshold_disk_util = 100
 
-## Threshold disk read kb/sec - defalut:98304(KB) = 96MB
-## watchdog.disk.threshold_disk_rkb = 98304
+## Threshold disk read kb/sec - defalut:262144(KB)
+## watchdog.disk.threshold_disk_rkb = 262144
 
-## Threshold disk write kb/sec - defalut:98304(KB) = 96MB
-## watchdog.disk.threshold_disk_wkb = 98304
+## Threshold disk write kb/sec - defalut:262144(KB)
+## watchdog.disk.threshold_disk_wkb = 262144
 
 ## disk target devices for checking disk utilization
 ## watchdog.disk.target_devices = []
 
-
 ##
 ##  Watchdog.Cluster
 ##
@@ -148,19 +162,6 @@ watchdog.rex.threshold_mem_capacity = 33554432
 ## watchdog.cluster.interval = 10
 
 
-##
-##  Watchdog.Error
-##
-## Is error-watchdog enabled - default:false
-## watchdog.error.is_enabled = false
-
-## error - watch interval - default:60sec
-## watchdog.error.interval = 60
-
-## error - threshold error count - default:100
-## watchdog.error.threshold_count = 100
-
-
 ## --------------------------------------------------------------------
 ## STORAGE - Autonomic Operation
 ## --------------------------------------------------------------------
@@ -186,18 +187,30 @@ 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 = 500
+## compaction.waiting_time_regular = 300
 
 ## Maximum value of compaction-proc waiting time/batch-proc(msec)
-##compaction.waiting_time_max = 3000
+## compaction.waiting_time_max = 1000
+
+## 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 = 1000
+## compaction.batch_procs_regular = 10000
 
 ## Maximum compaction batch processes
-##compaction.batch_procs_max = 1500
+## compaction.batch_procs_max = 100000
+
+## Step compaction batch processes
+## compaction.batch_procs_step = 1000
 
 
 ## --------------------------------------------------------------------
@@ -212,21 +225,33 @@ 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 = 3000
+mq.num_of_batch_process_max = 10000
 
 ## Regular value of bach processes of message
-mq.num_of_batch_process_regular = 1600
+mq.num_of_batch_process_regular = 1000
+
+## Step value of bach processes of message
+mq.num_of_batch_process_step = 250
 
 
 ##
 ## [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 = 3000
+mq.interval_between_batch_procs_max = 1000
 
 ## Regular value of interval between batch-procs(msec)
-mq.interval_between_batch_procs_regular = 500
+mq.interval_between_batch_procs_regular = 300
+
+## Step value of interval between batch-procs(msec)
+mq.interval_between_batch_procs_step = 100
 
 
 ## --------------------------------------------------------------------
@@ -321,10 +346,6 @@ leo_ordning_reda.temp_stacked_dir = "/var/db/leo_storage/ord_reda/"
 ## RPC-Client's size of connection buffer
 ## rpc.client.connection_buffer_size = 8
 
-## RPC-Client's max number of requests for reconnection to a remote-node
-## * 1..<integer>: specialized value
-## rpc.client.max_requests_for_reconnection = 64
-
 
 ## --------------------------------------------------------------------
 ## MANAGER - Mnesia