Merge branch 'release/1.0.0-pre2'

.gitignore

@@ -8,3 +8,4 @@ package/leo_storage*
 package/leo_gateway*
 
 rel/leo_manager/files/leo_manager.conf
+rel/leo_manager/files/leo_manager.schema

CHANGELOG.md

@@ -1,6 +1,50 @@
 CHANGELOG
 =========
 
+1.0.0-pre2 (Jan 22, 2014)
+=========================
+
+* New Features
+     * Implemented for Multi DC Replication
+         * Synchronize configuration and staus of remote cluster(s) after joined each other
+         * Regularly check status of remote cluster(s)
+         * Add the commands of Multi DC Replication in Manager
+              * 'join-cluster' and 'remove-cluster'
+* Improved
+     * The performance of the prefix search, which like a "ls"
+     * Changed format of the metadata because of improvement of the prefix search
+     * Removed Elasticsearch integration in the logger
+* Fixed Bugs
+     * Unexpected response from leo_storage to leo_gateway when an object wan not found
+     * Respond an error with deletion of an object when it was not found
+
+* Used libraries
+    * leo project
+        * [leo_backend-db v0.14.5](https://github.com/leo-project/leo_backend_db.git)
+        * [leo_cache v0.4.17](https://github.com/leo-project/leo_cache.git)
+        * [leo_commons v0.14.10](https://github.com/leo-project/leo_commons.git)
+        * [leo_dcerl v0.2.7](https://github.com/leo-project/leo_dcerl.git)
+        * [leo_logger v0.12.8](https://github.com/leo-project/leo_logger.git)
+        * [leo_mcerl v0.2.9](https://github.com/leo-project/leo_mcerl.git)
+        * [leo_mq v0.12.25](https://github.com/leo-project/leo_mq.git)
+        * [leo_object_storage v0.14.11](https://github.com/leo-project/leo_object_storage.git)
+        * [leo_ordning_reda v0.8.19](https://github.com/leo-project/leo_ordning_reda.git)
+        * [leo_pod v0.4.7](https://github.com/leo-project/leo_pod.git)
+        * [leo_redundant_manager v1.4.0](https://github.com/leo-project/leo_redundant_manager.git)
+        * [leo_rpc v0.6.2](https://github.com/leo-project/leo_rpc.git)
+        * [leo_s3_libs v0.12.27](https://github.com/leo-project/leo_s3_libs.git)
+        * [leo_statistics v0.14.9](https://github.com/leo-project/leo_statistics.git)
+        * [leo_gateway v1.0.0-pre2](https://github.com/leo-project/leo_gateway.git)
+        * [leo_manager v1.0.0-pre2](https://github.com/leo-project/leo_manager.git)
+        * [leo_storage v1.0.0-pre2](https://github.com/leo-project/leo_storage.git)
+    * others
+        * [bitcask v1.6.4](https://github.com/basho/bitcask.git)
+        * [cowboy v0.8.6](https://github.com/extend/cowboy.git)
+        * [folsom v0.8.0](https://github.com/boundary/folsom.git)
+        * [jiffy v0.8.5](https://github.com/davisp/jiffy.git)
+        * [lz4 v0.1.1](https://github.com/leo-project/erlang-lz4.git) - forked from [szktty/erlang-lz4](https://github.com/szktty/erlng-lz4)
+
+
 1.0.0-pre1 (Dec 27, 2013)
 =========================
 

Makefile

@@ -34,6 +34,7 @@ release:
 	rm -rf rel/leo_manager/leo_manager/
 	mkdir -p package/leo_manager_0
 	cp deps/leo_manager/priv/leo_manager_0.conf rel/leo_manager/files/leo_manager.conf
+	cp deps/leo_manager/priv/leo_manager_0.schema rel/leo_manager/files/leo_manager.schema
 	(cd rel/leo_manager && ../../rebar generate)
 	cp -r rel/leo_manager/leo_manager/* package/leo_manager_0/
 	##
@@ -42,6 +43,7 @@ release:
 	rm -rf rel/leo_manager/leo_manager/
 	mkdir -p package/leo_manager_1
 	cp deps/leo_manager/priv/leo_manager_1.conf rel/leo_manager/files/leo_manager.conf
+	cp deps/leo_manager/priv/leo_manager_1.schema rel/leo_manager/files/leo_manager.schema
 	(cd rel/leo_manager && ../../rebar generate)
 	cp -r rel/leo_manager/leo_manager/* package/leo_manager_1/
 	##

priv/test/app-m0.conf

@@ -37,7 +37,7 @@
 ## MANAGER
 ## --------------------------------------------------------------------
 ## LeoFS version
-system_version = 1.0.0-pre1
+system_version = 1.0.0-pre2
 
 ## Mode of Manager: [master, slave]
 manager.mode = master

priv/test/app-s0.conf

@@ -42,12 +42,16 @@ managers = [[email protected], [email protected]]
 ## STORAGE
 ## --------------------------------------------------------------------
 ## LeoFS version
-system_version = 1.0.0-pre1
+system_version = 1.0.0-pre2
 
 ## Object container
 obj_containers.path = [./avs]
 obj_containers.num_of_containers = [8]
 
+## e.g. Case of plural pathes
+## obj_containers.path = [/var/leofs/avs/1, /var/leofs/avs/2]
+## obj_containers.num_of_containers = [32, 64]
+
 
 ## A number of virtual-nodes for the redundant-manager
 ## num_of_vnodes = 168
@@ -89,7 +93,7 @@ mq.recovery_node.interval_max = 32
 ## STORAGE - Replication/Recovery object(s)
 ## --------------------------------------------------------------------
 ## Rack-id for the rack-awareness replica placement
-## replication.rack_awareness.rack_id = ""
+## replication.rack_awareness.rack_id =
 
 ## Size of stacked objects (bytes)
 ## replication.recovery.size_of_stacked_objs = 67108864
@@ -126,10 +130,48 @@ mq.recovery_node.interval_max = 32
 ## Directory of SNMP agent configuration
 snmp_agent = ./snmp/snmpa_storage_0/LEO-STORAGE
 
+
+## --------------------------------------------------------------------
+## Other Libs
+## --------------------------------------------------------------------
+## Enable profiler - leo_backend_db
+## leo_backend_db.profile = false
+
+## Enable profiler - leo_logger
+## leo_logger.profile = false
+
+## Enable profiler - leo_mq
+## leo_mq.profile = false
+
+## MQ backend storage: [bitcask, leveldb]
+## leo_mq.backend_db = bitcask
+
+## Enable profiler - leo_object_storage
+## leo_object_storage.profile = false
+
+## Enable strict check between checksum of a metadata and checksum of an object
+## leo_object_storage.is_strict_check = false
+
+## Metadata Storage: [bitcask, leveldb]
+leo_object_storage.metadata_storage = leveldb
+
+## Enable profiler - leo_ordning_reda
+## leo_ordning_reda.profile = false
+
+## Send after interval
+## leo_ordning_reda.send_after_interval = 100
+
+## Enable profiler - leo_redundant_manager
+## leo_redundant_manager.profile = false
+
+## Enable profiler - leo_statistics
+## leo_statistics.profile = false
+
+
 #======================================================================
 # For vm.args
 #======================================================================
-## Name of the leofs-gateway node
+## Name of the leofs-storage node
 nodename = [email protected]
 
 ## Cookie for distributed node communication.  All nodes in the same cluster

priv/test/app-s1.conf

@@ -42,12 +42,16 @@ managers = [[email protected], [email protected]]
 ## STORAGE
 ## --------------------------------------------------------------------
 ## LeoFS version
-system_version = 1.0.0-pre1
+system_version = 1.0.0-pre2
 
 ## Object container
 obj_containers.path = [./avs]
 obj_containers.num_of_containers = [8]
 
+## e.g. Case of plural pathes
+## obj_containers.path = [/var/leofs/avs/1, /var/leofs/avs/2]
+## obj_containers.num_of_containers = [32, 64]
+
 
 ## A number of virtual-nodes for the redundant-manager
 ## num_of_vnodes = 168
@@ -89,7 +93,7 @@ mq.recovery_node.interval_max = 32
 ## STORAGE - Replication/Recovery object(s)
 ## --------------------------------------------------------------------
 ## Rack-id for the rack-awareness replica placement
-## replication.rack_awareness.rack_id = ""
+## replication.rack_awareness.rack_id =
 
 ## Size of stacked objects (bytes)
 ## replication.recovery.size_of_stacked_objs = 67108864
@@ -126,10 +130,48 @@ mq.recovery_node.interval_max = 32
 ## Directory of SNMP agent configuration
 snmp_agent = ./snmp/snmpa_storage_1/LEO-STORAGE
 
+
+## --------------------------------------------------------------------
+## Other Libs
+## --------------------------------------------------------------------
+## Enable profiler - leo_backend_db
+## leo_backend_db.profile = false
+
+## Enable profiler - leo_logger
+## leo_logger.profile = false
+
+## Enable profiler - leo_mq
+## leo_mq.profile = false
+
+## MQ backend storage: [bitcask, leveldb]
+## leo_mq.backend_db = bitcask
+
+## Enable profiler - leo_object_storage
+## leo_object_storage.profile = false
+
+## Enable strict check between checksum of a metadata and checksum of an object
+## leo_object_storage.is_strict_check = false
+
+## Metadata Storage: [bitcask, leveldb]
+leo_object_storage.metadata_storage = leveldb
+
+## Enable profiler - leo_ordning_reda
+## leo_ordning_reda.profile = false
+
+## Send after interval
+## leo_ordning_reda.send_after_interval = 100
+
+## Enable profiler - leo_redundant_manager
+## leo_redundant_manager.profile = false
+
+## Enable profiler - leo_statistics
+## leo_statistics.profile = false
+
+
 #======================================================================
 # For vm.args
 #======================================================================
-## Name of the leofs-gateway node
+## Name of the leofs-storage node
 nodename = [email protected]
 
 ## Cookie for distributed node communication.  All nodes in the same cluster

priv/test/app-s2.conf

@@ -42,12 +42,16 @@ managers = [[email protected], [email protected]]
 ## STORAGE
 ## --------------------------------------------------------------------
 ## LeoFS version
-system_version = 1.0.0-pre1
+system_version = 1.0.0-pre2
 
 ## Object container
 obj_containers.path = [./avs]
 obj_containers.num_of_containers = [8]
 
+## e.g. Case of plural pathes
+## obj_containers.path = [/var/leofs/avs/1, /var/leofs/avs/2]
+## obj_containers.num_of_containers = [32, 64]
+
 
 ## A number of virtual-nodes for the redundant-manager
 ## num_of_vnodes = 168
@@ -89,7 +93,7 @@ mq.recovery_node.interval_max = 32
 ## STORAGE - Replication/Recovery object(s)
 ## --------------------------------------------------------------------
 ## Rack-id for the rack-awareness replica placement
-## replication.rack_awareness.rack_id = ""
+## replication.rack_awareness.rack_id =
 
 ## Size of stacked objects (bytes)
 ## replication.recovery.size_of_stacked_objs = 67108864
@@ -126,10 +130,48 @@ mq.recovery_node.interval_max = 32
 ## Directory of SNMP agent configuration
 snmp_agent = ./snmp/snmpa_storage_2/LEO-STORAGE
 
+
+## --------------------------------------------------------------------
+## Other Libs
+## --------------------------------------------------------------------
+## Enable profiler - leo_backend_db
+## leo_backend_db.profile = false
+
+## Enable profiler - leo_logger
+## leo_logger.profile = false
+
+## Enable profiler - leo_mq
+## leo_mq.profile = false
+
+## MQ backend storage: [bitcask, leveldb]
+## leo_mq.backend_db = bitcask
+
+## Enable profiler - leo_object_storage
+## leo_object_storage.profile = false
+
+## Enable strict check between checksum of a metadata and checksum of an object
+## leo_object_storage.is_strict_check = false
+
+## Metadata Storage: [bitcask, leveldb]
+leo_object_storage.metadata_storage = leveldb
+
+## Enable profiler - leo_ordning_reda
+## leo_ordning_reda.profile = false
+
+## Send after interval
+## leo_ordning_reda.send_after_interval = 100
+
+## Enable profiler - leo_redundant_manager
+## leo_redundant_manager.profile = false
+
+## Enable profiler - leo_statistics
+## leo_statistics.profile = false
+
+
 #======================================================================
 # For vm.args
 #======================================================================
-## Name of the leofs-gateway node
+## Name of the leofs-storage node
 nodename = [email protected]
 
 ## Cookie for distributed node communication.  All nodes in the same cluster

priv/test/app-s3.conf

@@ -42,15 +42,15 @@ managers = [[email protected], [email protected]]
 ## STORAGE
 ## --------------------------------------------------------------------
 ## LeoFS version
-system_version = 1.0.0-pre1
+system_version = 1.0.0-pre2
 
 ## Object container
 obj_containers.path = [./avs]
 obj_containers.num_of_containers = [8]
 
-
-## obj_containers.path.2 = ./path/to
-## obj_containers.num_of_containers.2 = 16
+## e.g. Case of plural pathes
+## obj_containers.path = [/var/leofs/avs/1, /var/leofs/avs/2]
+## obj_containers.num_of_containers = [32, 64]
 
 
 ## A number of virtual-nodes for the redundant-manager
@@ -93,7 +93,7 @@ mq.recovery_node.interval_max = 32
 ## STORAGE - Replication/Recovery object(s)
 ## --------------------------------------------------------------------
 ## Rack-id for the rack-awareness replica placement
-## replication.rack_awareness.rack_id = ""
+## replication.rack_awareness.rack_id =
 
 ## Size of stacked objects (bytes)
 ## replication.recovery.size_of_stacked_objs = 67108864
@@ -130,10 +130,48 @@ mq.recovery_node.interval_max = 32
 ## Directory of SNMP agent configuration
 snmp_agent = ./snmp/snmpa_storage_3/LEO-STORAGE
 
+
+## --------------------------------------------------------------------
+## Other Libs
+## --------------------------------------------------------------------
+## Enable profiler - leo_backend_db
+## leo_backend_db.profile = false
+
+## Enable profiler - leo_logger
+## leo_logger.profile = false
+
+## Enable profiler - leo_mq
+## leo_mq.profile = false
+
+## MQ backend storage: [bitcask, leveldb]
+## leo_mq.backend_db = bitcask
+
+## Enable profiler - leo_object_storage
+## leo_object_storage.profile = false
+
+## Enable strict check between checksum of a metadata and checksum of an object
+## leo_object_storage.is_strict_check = false
+
+## Metadata Storage: [bitcask, leveldb]
+leo_object_storage.metadata_storage = leveldb
+
+## Enable profiler - leo_ordning_reda
+## leo_ordning_reda.profile = false
+
+## Send after interval
+## leo_ordning_reda.send_after_interval = 100
+
+## Enable profiler - leo_redundant_manager
+## leo_redundant_manager.profile = false
+
+## Enable profiler - leo_statistics
+## leo_statistics.profile = false
+
+
 #======================================================================
 # For vm.args
 #======================================================================
-## Name of the leofs-gateway node
+## Name of the leofs-storage node
 nodename = [email protected]
 
 ## Cookie for distributed node communication.  All nodes in the same cluster