Merge branch 'release/1.2.18'

leo-project · Jan 7, 2016 · 79976d2 · 79976d2
2 parents ef10236 + 7476431
commit 79976d2
Show file tree

Hide file tree

Showing 45 changed files with 4,723 additions and 73 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,57 @@
 CHANGELOG
 =========
 
+1.2.18 (January 7, 2016)
+===========================
+
+* Improvements
+    * [#426](https://github.com/leo-project/leofs/issues/426) ``leo_storage`` Should be logged with warning or error level in some cases
+    * [#434](https://github.com/leo-project/leofs/issues/434) ``leo_manager`` Enable to reconfigure a consistency level
+    * [#435](https://github.com/leo-project/leofs/issues/435) ``leo_manager`` Enable to reconfigure a log level of storage and gateway node(s)
+    * [#437](https://github.com/leo-project/leofs/issues/437) ``leo_mq`` Replace bitcask used by leo_mq behind the scene with an appropriate one
+
+* Fixed Bugs
+    * [#190](https://github.com/leo-project/leofs/issues/190) ``leo_gateway`` ``leo_storage`` Multipart uploads of large files produces partially corrupted data when upload chunk size
+    * [#427](https://github.com/leo-project/leofs/issues/427) ``leo_storage`` Need to fix the possibility of infinite loop w/the recover-node or the rebalance feature
+    * [#438](https://github.com/leo-project/leofs/issues/438) ``leo_s3_libs`` Requests to leo_gateway take too much time when leo_manager is down
+    * [#439](https://github.com/leo-project/leofs/issues/439) ``mdc-replication`` ``leo_redundant_manager`` Failed upgrading leo_cluster_info table from 1.2.x to 1.2.x
+* Used libraries
+    * leo project
+        * [leo_backend-db v1.1.14](https://github.com/leo-project/leo_backend_db/releases/tag/1.1.15)
+        * [leo_cache v0.6.10](https://github.com/leo-project/leo_cache/tag/0.6.10)
+        * [leo_commons v1.1.6](https://github.com/leo-project/leo_commons/releases/tag/1.1.6)
+        * [leo_dcerl v0.4.1](https://github.com/leo-project/leo_dcerl/releases/tag/0.4.1)
+        * [leo_logger v1.2.2](https://github.com/leo-project/leo_logger/releases/tag/1.2.2)
+        * [leo_mcerl v0.6.0](https://github.com/leo-project/leo_mcerl/releases/tag/0.6.0)
+        * [leo_mq v1.3.18](https://github.com/leo-project/leo_mq/releases/tag/1.3.18)
+        * [leo_object_storage](https://github.com/leo-project/leo_object_storage/tag/1.2.12)
+        * [leo_ordning_reda v1.1.4](https://github.com/leo-project/leo_ordning_reda/releases/tag/1.1.4)
+        * [leo_redundant_manager 1.9.22](https://github.com/leo-project/leo_redundant_manager/releases/tag/1.9.22)
+        * [leo_rpc v0.10.7](https://github.com/leo-project/leo_rpc/releases/tag/0.10.7)
+        * [leo_pod v0.6.4](https://github.com/leo-project/leo_pod/releases/tag/0.6.4)
+        * [leo_s3_libs v1.1.10](https://github.com/leo-project/leo_s3_libs/releases/tag/1.1.10)
+        * [leo_statistics v1.1.10](https://github.com/leo-project/leo_statistics/releases/tag/1.1.10)
+        * [leo_tran v0.2.4](https://github.com/leo-project/leo_tran/releases/tag/0.2.4)
+        * [leo_watchdog v0.12.1](https://github.com/leo-project/leo_watchdog/releases/tag/0.12.1)
+        * [savanna_agent v0.4.13](https://github.com/leo-project/savanna_agent/releases/tag/0.4.13)
+        * [savanna_commons v0.8.16](https://github.com/leo-project/savanna_commons/releases/tag/0.8.16)
+        * [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.18](https://github.com/leo-project/leo_gateway/releases/tag/1.2.18)
+        * [leo_manager v1.2.18](https://github.com/leo-project/leo_manager/releases/tag/1.2.18)
+        * [leo_storage v1.2.18](https://github.com/leo-project/leo_storage/releases/tag/1.2.18)
+    * others
+        * [bitcask v2.0.1](https://github.com/lbasho/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.4](https://github.com/basho/eleveldb/releases/tag/2.1.4)
+        * [folsom v0.8.2-for-leofs](https://github.com/leo-project/folsom/releases/tag/0.8.2-for-leofs)
+        * [jiffy v0.14.4](https://github.com/davisp/jiffy/releases/tag/0.14.4)
+        * [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.16 (Octorber 9, 2015)
 ===========================
 

diff --git a/Makefile b/Makefile
@@ -1,3 +1,24 @@
+#======================================================================
+#
+# LeoFS
+#
+# Copyright (c) 2012-2015 Rakuten, Inc.
+#
+# This file is provided to you under the Apache License,
+# Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License.  You may obtain
+# a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#======================================================================
 .PHONY: deps test
 
 all: deps compile

diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ LeoFS packages have been already provided on the Web. You're able to easily inst
 * LeoProject
     * <a target="_blank" href="http://leo-project.net/leofs/download.html">CentOS-7.0</a>
     * <a target="_blank" href="http://leo-project.net/leofs/download.html">CentOS-6.x</a>
-    * <a target="_blank" href="http://leo-project.net/leofs/download.html">13.10 and 14.04</a>
+    * <a target="_blank" href="http://leo-project.net/leofs/download.html">14.04 and later</a>
 * Community
     * <a target="_blank" href="http://www.freshports.org/databases/leofs">FreeBSD</a>
 
@@ -99,12 +99,12 @@ $ make
 $ sudo make install
 
 ##
-## 2. Install Erlang (17.4)
+## 2. Install Erlang (17.5)
 ##
-$ wget http://www.erlang.org/download/otp_src_17.4.tar.gz
-$ tar xzf otp_src_17.4.tar.gz
-$ cd otp_src_17.4
-$ ./configure --prefix=/usr/local/erlang/17.4 \
+$ wget http://www.erlang.org/download/otp_src_17.5.tar.gz
+$ tar xzf otp_src_17.5.tar.gz
+$ cd otp_src_17.5
+$ ./configure --prefix=/usr/local/erlang/17.5 \
               --enable-smp-support \
               --enable-m64-build \
               --enable-halfword-emulator \
@@ -123,7 +123,7 @@ $ sudo make install
 ##
 $ vi ~/.profile
     ## append the follows:
-    export ERL_HOME=/usr/local/erlang/17.4
+    export ERL_HOME=/usr/local/erlang/17.5
     export PATH=$PATH:$ERL_HOME/bin
 
 $ source ~/.profile
@@ -162,54 +162,78 @@ $ package/leo_manager_1/bin/leo_manager start
 $ package/leo_storage/bin/leo_storage start
 $ package/leo_gateway/bin/leo_gateway start
 $ ./leofs-adm status
-[System config]
-                System version : 1.0.0
-                    Cluster Id : leofs_1
-                         DC Id : dc_1
-                Total replicas : 1
-           # of successes of R : 1
-           # of successes of W : 1
-           # of successes of D : 1
- # of DC-awareness replicas    : 0
-                     ring size : 2^128
-             Current ring hash : 941f20fc
-                Prev ring hash : 000000-1
-[Multi DC replication settings]
-         max # of joinable DCs : 2
-            # of replicas a DC : 1
-
-[Node(s) state]
+ [System Confiuration]
+-----------------------------------+----------
+ Item                              | Value
+-----------------------------------+----------
+ Basic/Consistency level
+-----------------------------------+----------
+                    system version | 1.2.16
+                        cluster Id | leofs_1
+                             DC Id | dc_1
+                    Total replicas | 2
+          number of successes of R | 1
+          number of successes of W | 1
+          number of successes of D | 1
+ number of rack-awareness replicas | 0
+                         ring size | 2^128
+-----------------------------------+----------
+ Multi DC replication settings
+-----------------------------------+----------
+        max number of joinable DCs | 2
+           number of replicas a DC | 1
+-----------------------------------+----------
+ Manager RING hash
+-----------------------------------+----------
+                 current ring-hash | 3923d007
+                previous ring-hash | 3923d007
+-----------------------------------+----------
+
+ [State of Node(s)]
 -------+--------------------------+--------------+----------------+----------------+----------------------------
  type  |           node           |    state     |  current ring  |   prev ring    |          updated at
 -------+--------------------------+--------------+----------------+----------------+----------------------------
-  S    | storage_0@127.0.0.1      | attached     |                |                | 2014-04-16 10:09:59 +0900
+  S    | storage_0@127.0.0.1      | running      | 3923d007       | 3923d007       | 2015-10-30 09:44:11 +0900
+-------+--------------------------+--------------+----------------+----------------+----------------------------
 
 $ ./leofs-adm start
 OK
 
 $ ./leofs-adm status
-[System config]
-                System version : 1.0.0
-                    Cluster Id : leofs_1
-                         DC Id : dc_1
-                Total replicas : 1
-           # of successes of R : 1
-           # of successes of W : 1
-           # of successes of D : 1
- # of DC-awareness replicas    : 0
-                     ring size : 2^128
-             Current ring hash : 941f20fc
-                Prev ring hash : 941f20fc
-[Multi DC replication settings]
-         max # of joinable DCs : 2
-            # of replicas a DC : 1
-
-[Node(s) state]
+-----------------------------------+----------
+ Item                              | Value
+-----------------------------------+----------
+ Basic/Consistency level
+-----------------------------------+----------
+                    system version | 1.2.16
+                        cluster Id | leofs_1
+                             DC Id | dc_1
+                    Total replicas | 2
+          number of successes of R | 1
+          number of successes of W | 1
+          number of successes of D | 1
+ number of rack-awareness replicas | 0
+                         ring size | 2^128
+-----------------------------------+----------
+ Multi DC replication settings
+-----------------------------------+----------
+        max number of joinable DCs | 2
+           number of replicas a DC | 1
+-----------------------------------+----------
+ Manager RING hash
+-----------------------------------+----------
+                 current ring-hash | 3923d007
+                previous ring-hash | 3923d007
+-----------------------------------+----------
+
+ [State of Node(s)]
 -------+--------------------------+--------------+----------------+----------------+----------------------------
  type  |           node           |    state     |  current ring  |   prev ring    |          updated at
 -------+--------------------------+--------------+----------------+----------------+----------------------------
-  S    | storage_0@127.0.0.1      | running      | 941f20fc       | 941f20fc       | 2014-04-16 10:09:59 +0900
-  G    | gateway_0@127.0.0.1      | running      | 941f20fc       | 941f20fc       | 2014-04-16 10:09:59 +0900
+  S    | storage_0@127.0.0.1      | running      | 3923d007       | 3923d007       | 2015-10-30 09:44:11 +0900
+  G    | gateway_0@127.0.0.1      | running      | 3923d007       | 3923d007       | 2015-10-30 09:45:27 +0900
+-------+--------------------------+--------------+----------------+----------------+----------------------------
+
 
 ```
 

diff --git a/bootstrap.sh b/bootstrap.sh
@@ -3,7 +3,7 @@
 #
 # LeoFS
 #
-# Copyright (c) 2012-2014 Rakuten, Inc.
+# Copyright (c) 2012-2015 Rakuten, Inc.
 #
 # This file is provided to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file
@@ -53,8 +53,6 @@ if [ $1 = "stop" ]; then
 fi
 
 ## Generate the packages
-rm -rf package/leo_*
-./rebar compile
 make release
 
 ## Copy the storage-files
@@ -67,20 +65,20 @@ rm -rf package/leo_storage
 rm -rf package/leo_gateway
 
 if [ $2 = "integration-test" ]; then
-    cp priv/integration-test/app-m0.conf package/leo_manager_0/etc/leo_manager.conf
-    cp priv/integration-test/app-m1.conf package/leo_manager_1/etc/leo_manager.conf
-    cp priv/integration-test/app-s0.conf package/leo_storage_0/etc/leo_storage.conf
-    cp priv/integration-test/app-s1.conf package/leo_storage_1/etc/leo_storage.conf
-    cp priv/integration-test/app-s2.conf package/leo_storage_2/etc/leo_storage.conf
-    cp priv/integration-test/app-s3.conf package/leo_storage_3/etc/leo_storage.conf
-    cp priv/integration-test/app-g0.conf package/leo_gateway_0/etc/leo_gateway.conf
+    cp priv/test/integration-test/app-m0.conf package/leo_manager_0/etc/leo_manager.conf
+    cp priv/test/integration-test/app-m1.conf package/leo_manager_1/etc/leo_manager.conf
+    cp priv/test/integration-test/app-s0.conf package/leo_storage_0/etc/leo_storage.conf
+    cp priv/test/integration-test/app-s1.conf package/leo_storage_1/etc/leo_storage.conf
+    cp priv/test/integration-test/app-s2.conf package/leo_storage_2/etc/leo_storage.conf
+    cp priv/test/integration-test/app-s3.conf package/leo_storage_3/etc/leo_storage.conf
+    cp priv/test/integration-test/app-g0.conf package/leo_gateway_0/etc/leo_gateway.conf
 else
-    cp priv/watchdog-test/app-m0.conf package/leo_manager_0/etc/leo_manager.conf
-    cp priv/watchdog-test/app-m1.conf package/leo_manager_1/etc/leo_manager.conf
-    cp priv/watchdog-test/app-s0.conf package/leo_storage_0/etc/leo_storage.conf
-    cp priv/watchdog-test/app-s1.conf package/leo_storage_1/etc/leo_storage.conf
-    cp priv/watchdog-test/app-s2.conf package/leo_storage_2/etc/leo_storage.conf
-    cp priv/watchdog-test/app-s3.conf package/leo_storage_3/etc/leo_storage.conf
+    cp priv/test/watchdog-test/app-m0.conf package/leo_manager_0/etc/leo_manager.conf
+    cp priv/test/watchdog-test/app-m1.conf package/leo_manager_1/etc/leo_manager.conf
+    cp priv/test/watchdog-test/app-s0.conf package/leo_storage_0/etc/leo_storage.conf
+    cp priv/test/watchdog-test/app-s1.conf package/leo_storage_1/etc/leo_storage.conf
+    cp priv/test/watchdog-test/app-s2.conf package/leo_storage_2/etc/leo_storage.conf
+    cp priv/test/watchdog-test/app-s3.conf package/leo_storage_3/etc/leo_storage.conf
 fi
 
 ## Launch the applications

diff --git a/leofs-adm b/leofs-adm
@@ -460,6 +460,34 @@ usage_dump_ring() {
     esac
 }
 
+usage_update_log_level() {
+    USAGE="update-log-level ($STORAGE_NODE|$GATEWAY_NODE) (debug|info|warn|error)"
+    case "$1" in
+        min)
+            output "$WHITESPACE $USAGE "
+            ;;
+        *)
+            output "Usage:"
+            output "  $SCRIPT $USAGE"
+            output "Description:"
+            output "  - Update a log level of the node"
+    esac
+}
+
+usage_update_consistency_level() {
+    USAGE="update-consistency-level <write-quorum> <read-quorum> <delete-quorum>"
+    case "$1" in
+        min)
+            output "$WHITESPACE $USAGE "
+            ;;
+        *)
+            output "Usage:"
+            output "  $SCRIPT $USAGE"
+            output "Description:"
+            output "  - Update a consistency level of the node"
+    esac
+}
+
 usage_update_property() {
     USAGE="update-property <node> <property-name> <property-value>"
     case "$1" in
@@ -827,6 +855,8 @@ usage() {
     usage_restore_mnesia min
     usage_update_managers min
     usage_dump_ring min
+    usage_update_log_level min
+    usage_update_consistency_level min
     output ""
     output "      ${UNDERLINE}Watchdog Operation:${NONE}"
     usage_update_property min
@@ -1288,6 +1318,21 @@ case "$1" in
             usage_dump_ring
         fi
         ;;
+    update-log-level)
+        if [ $# -eq 3 ]; then
+            send_command "$@"
+        else
+            usage_update_log_level
+        fi
+        ;;
+
+    update-consistency-level)
+        if [ $# -eq 4 ]; then
+            send_command "$@"
+        else
+            usage_update_consistency_level
+        fi
+        ;;
 
     ##
     ## Watchdog Operation

diff --git a/leofs.mk b/leofs.mk
@@ -1 +1 @@
-LEOFS_VERSION=1.2.16
+LEOFS_VERSION=1.2.18
diff --git a/mdcr.sh b/mdcr.sh
@@ -110,15 +110,15 @@ deploy()
 	    cp -r package/leo_storage package/${cname}/leo_storage_${j}
 	done
 
-	cp priv/mdcr-test/${cname}/leo_manager.conf.0 \
+	cp priv/test/mdcr-test/${cname}/leo_manager.conf.0 \
 	    package/${cname}/leo_manager_0/etc/leo_manager.conf
-	cp priv/mdcr-test/${cname}/leo_manager.conf.1 \
+	cp priv/test/mdcr-test/${cname}/leo_manager.conf.1 \
 	    package/${cname}/leo_manager_1/etc/leo_manager.conf
-	cp priv/mdcr-test/${cname}/leo_gateway.conf \
+	cp priv/test/mdcr-test/${cname}/leo_gateway.conf \
 	    package/${cname}/leo_gateway_0/etc/leo_gateway.conf
 	for j in `seq 0 $((CLUSTER_NSTORAGES - 1))`
 	do
-	    cp priv/mdcr-test/${cname}/leo_storage_${j}.conf \
+	    cp priv/test/mdcr-test/${cname}/leo_storage_${j}.conf \
 		package/${cname}/leo_storage_${j}/etc/leo_storage.conf
 	done