Merge branch 'release/0.16.5'

leo-project · Nov 26, 2013 · 7589119 · 7589119
2 parents 58cdebc + 38e420f
commit 7589119
Show file tree

Hide file tree

Showing 32 changed files with 243 additions and 74 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,56 @@
 CHANGELOG
 =========
 
+0.16.5 (Nov 26, 2013)
+=====================
+
+* Improved
+   * S3-API related
+      * [#103] (https://github.com/leo-project/leofs/issues/103) Able to change password on Manager console
+      * [#105] (https://github.com/leo-project/leofs/issues/105) Able to change an owner of a bucket
+      * [#106] (https://github.com/leo-project/leofs/issues/106) Rename *set-endpoint* to *add-endpoint* in order to unify it and other commands
+      * Multicast *update-acl* to Gateway's node(s)
+      * Multicast *delete-bucket* to Gateway's node(s)
+   * Other
+      * Revised that manage redundant nodes toward the multi data center replication
+        * Supported that manage previous and current members in a cluster in order not to happen lost data during the period of relocation of data
+        * Able to recover that Manager failed to send massage of relocation from Manager to Storage(s)
+        * Reduced costs of relocation of data than previous version
+      * [#98] (https://github.com/leo-project/leofs/issues/98) Made a bucket name compatible with the AWS-S3 naming rule of US-region
+      * [#99] (https://github.com/leo-project/leofs/issues/99) Able to set log-directory of *leo-redundant-manager*
+      * Supported Ubuntu-13.10 (include Ubuntu Server 13.10)
+* Fixed Bugs
+  * [#94] (https://github.com/leo-project/leofs/issues/94) Happened an error when parsing XML document with S3's Java-Client
+  * [#95] (https://github.com/leo-project/leofs/issues/95) Could not resume storage node
+  * [#96] (https://github.com/leo-project/leofs/issues/96) Happened an error when Gateway is requested from *boto*
+  * [#97] (https://github.com/leo-project/leofs/issues/97) Could not upload an object when including a bucket name in a path
+  * [#100] (https://github.com/leo-project/leofs/issues/100) Broken records after update from 0.14.9 to 0.16.0
+
+* Used libraries
+    * leo project
+        * [leo_backend-db v0.14.1](https://github.com/leo-project/leo_backend_db.git)
+        * [leo_cache v0.4.14](https://github.com/leo-project/leo_cache.git)
+        * [leo_commons v0.14.8](https://github.com/leo-project/leo_commons.git)
+        * [leo_dcerl v0.2.5](https://github.com/leo-project/leo_dcerl.git)
+        * [leo_logger v0.12.5](https://github.com/leo-project/leo_logger.git)
+        * [leo_mcerl v0.2.7](https://github.com/leo-project/leo_mcerl.git)
+        * [leo_mq v0.12.21](https://github.com/leo-project/leo_mq.git)
+        * [leo_object_storage v0.14.7](https://github.com/leo-project/leo_object_storage.git)
+        * [leo_ordning_reda v0.8.17](https://github.com/leo-project/leo_ordning_reda.git)
+        * [leo_redundant_manager v1.2.3](https://github.com/leo-project/leo_redundant_manager.git)
+        * [leo_s3_libs v0.12.21](https://github.com/leo-project/leo_s3_libs.git)
+        * [leo_statistics v0.14.6](https://github.com/leo-project/leo_statistics.git)
+        * [leo_gateway v0.16.5](https://github.com/leo-project/leo_gateway.git)
+        * [leo_manager v0.16.5](https://github.com/leo-project/leo_manager.git)
+        * [leo_storage v0.16.5](https://github.com/leo-project/leo_storage.git)
+    * others
+        * [bitcask v1.6.2](https://github.com/basho/bitcask.git)
+        * [cowboy v0.8.6](https://github.com/extend/cowboy.git)
+        * [folsom](https://github.com/boundary/folsom.git)
+        * [jiffy](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)
+
+
 0.16.0 (Oct 25, 2013)
 =====================
 

diff --git a/THANKS b/THANKS
@@ -2,11 +2,14 @@ The following people have contributed to LeoFS and/or one of the related librari
 
 THANKS
 ------
-Ryosuke 'Voluntas' Nakai
+Ryosuke Nakai
 Masaki Matsushita
 Yohei Sasaki
 Jun Takizawa
 Nobuhiro Iwamatsu
 Loïc Hoguin
 Hitoshi Kuroyanagi
 Heinz N. Gies
+Hiroki Matsue
+Yoshinori Oe
+Satoshi Egi
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -39,6 +39,7 @@ package/leo_gateway_0/bin/leo_gateway stop
 package/leo_storage_0/bin/leo_storage stop
 package/leo_storage_1/bin/leo_storage stop
 package/leo_storage_2/bin/leo_storage stop
+package/leo_storage_3/bin/leo_storage stop
 package/leo_manager_0/bin/leo_manager stop
 package/leo_manager_1/bin/leo_manager stop
 if [ $1 = "stop" ]; then
@@ -54,6 +55,7 @@ make release
 cp -r package/leo_storage package/leo_storage_0
 cp -r package/leo_storage package/leo_storage_1
 cp -r package/leo_storage package/leo_storage_2
+cp -r package/leo_storage package/leo_storage_3
 cp -r package/leo_gateway package/leo_gateway_0
 rm -rf package/leo_storage
 rm -rf package/leo_gateway
@@ -62,10 +64,12 @@ cp priv/test/app-m0.config package/leo_manager_0/etc/app.config
 cp priv/test/app-s0.config package/leo_storage_0/etc/app.config
 cp priv/test/app-s1.config package/leo_storage_1/etc/app.config
 cp priv/test/app-s2.config package/leo_storage_2/etc/app.config
+cp priv/test/app-s3.config package/leo_storage_3/etc/app.config
 
 cp priv/test/vm-s0.config package/leo_storage_0/etc/vm.args
 cp priv/test/vm-s1.config package/leo_storage_1/etc/vm.args
 cp priv/test/vm-s2.config package/leo_storage_2/etc/vm.args
+cp priv/test/vm-s3.config package/leo_storage_3/etc/vm.args
 
 ## launch
 if [ $1 = "build" ]; then
@@ -80,6 +84,8 @@ sleep 1
 ./package/leo_storage_1/bin/leo_storage start
 sleep 1
 ./package/leo_storage_2/bin/leo_storage start
+sleep 1
+./package/leo_storage_3/bin/leo_storage start
 
 echo ":::"
 echo "::: starting storages :::"

diff --git a/leofs.mk b/leofs.mk
@@ -0,0 +1 @@
+LEOFS_VERSION=0.16.0
diff --git a/pkg/leo_gateway/Makefile b/pkg/leo_gateway/Makefile
@@ -1,4 +1,5 @@
-VERSION=0.14.9
+include ../../leofs.mk
+VERSION=$(LEOFS_VERSION)
 COMPONENT_INTERNAL=leo_gateway
 COMPONENT=leo_gateway
 COMPONENT_PATH=../../package/$(COMPONENT_INTERNAL)
@@ -17,8 +18,8 @@ bootstrap:
 	cp files/start $(DIR)/erts-*/bin/start
 	rm $(DIR)/etc/app.config
 	cp files/app.config $(DIR)/etc/app.config.example
-	cp files/leo_gateway_snmp.config.0 $(DIR)/snmp/snmpa_gateway_0/
-	cp files/leo_gateway_snmp.config.1 $(DIR)/snmp/snmpa_gateway_1/
+	cp files/leo_gateway_snmp.config.0 $(DIR)/snmp/snmpa_gateway_0/leo_gateway_snmp.config
+	cp files/leo_gateway_snmp.config.1 $(DIR)/snmp/snmpa_gateway_1/leo_gateway_snmp.config
 	mv $(DIR)/etc/vm.args $(DIR)/etc/vm.args.example
 
 package_list: bootstrap

diff --git a/pkg/leo_gateway/files/app.config b/pkg/leo_gateway/files/app.config
@@ -31,15 +31,15 @@
 
  {leo_gateway, [
                 %% System Ver
-                {system_version, "0.14.9" },
+                {system_version, "0.16.0" },
 
                 %% Gateway Properties:
                 {http, [
                         %% http-handler:
-                        %%   [rest | s3 | swift]
+                        %%   [rest | s3 | embed]
                         {handler, s3},
                         %% Gateway port number:
-                        {port, 9090 },
+                        {port, 8080 },
                         %% # of acceptors:
                         {num_of_acceptors, 128 },
                         %% # of max keepalive
@@ -51,7 +51,8 @@
                         {ssl_certfile, "./etc/server_cert.pem" },
                         {ssl_keyfile,  "./etc/server_key.pem" }
                        ]},
-
+                %% S3-API Properties:
+                {bucket_prop_sync_interval, 300 },
                 %% Large-object-related properties:
                 {large_object, [
                                 {max_chunked_objs,  1000  },
@@ -110,7 +111,12 @@
                 {log_level,    1 },
 
                 %% Output Access-log?
-                {is_enable_access_log, true },
+                {is_enable_access_log,  true },
+                {is_enable_esearch,     false },
+                {esearch_host,          "127.0.0.1" },
+                {esearch_port,          9200 },
+                {esearch_timeout,       10000 },
+                {esearch_bulk_duration, 3000 },
 
                 %% Log appender - [file]
                 {log_appender, [

diff --git a/pkg/leo_gateway/files/leo_gateway.xml b/pkg/leo_gateway/files/leo_gateway.xml
@@ -47,7 +47,7 @@ Copyright 2012 Project FiFo / Heinz N. Gies
         exec='/opt/local/leo_gateway/bin/leo_gateway %m'
         timeout_seconds='30'>
       <method_context>
-        <method_credential user='leofs' group='leofs' />
+        <!--method_credential user='leofs' group='leofs' /-->
         <method_environment>
           <envvar name='PATH' value='/opt/local/gnu/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/usr/sbin'/>
           <envvar name='HOME' value='/var/db/leo_gateway'/>
@@ -62,7 +62,7 @@ Copyright 2012 Project FiFo / Heinz N. Gies
         exec='/opt/local/leo_gateway/bin/leo_gateway %m'
         timeout_seconds='120'>
       <method_context>
-        <method_credential user='leofs' group='leofs' />
+        <!--method_credential user='leofs' group='leofs' /-->
         <method_environment>
           <envvar name='PATH' value='/opt/local/gnu/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/usr/sbin'/>
           <envvar name='HOME' value='/var/db/leo_gateway'/>
@@ -77,7 +77,7 @@ Copyright 2012 Project FiFo / Heinz N. Gies
         exec='/opt/local/leo_gateway/bin/leo_gateway %m'
         timeout_seconds='120'>
       <method_context>
-        <method_credential user='leofs' group='leofs' />
+        <!--method_credential user='leofs' group='leofs' /-->
         <method_environment>
           <envvar name='PATH' value='/opt/local/gnu/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/usr/sbin'/>
           <envvar name='HOME' value='/var/db/leo_gateway'/>

diff --git a/pkg/leo_manager/Makefile b/pkg/leo_manager/Makefile
@@ -1,4 +1,5 @@
-VERSION=0.14.9
+include ../../leofs.mk
+VERSION=$(LEOFS_VERSION)
 COMPONENT_INTERNAL=leo_manager
 COMPONENT=leo_manager
 COMPONENT_PATH=../../package/$(COMPONENT_INTERNAL)_0

diff --git a/pkg/leo_manager/files/app.config.master b/pkg/leo_manager/files/app.config.master
@@ -34,7 +34,7 @@
              ]},
     {leo_manager, [
                    %% == System Ver ==
-                   {system_version, "0.14.9" },
+                   {system_version, "0.16.0" },
 
                    %% == System Configuration ==
                    %%

diff --git a/pkg/leo_manager/files/leo_manager.xml b/pkg/leo_manager/files/leo_manager.xml
@@ -47,7 +47,7 @@ Copyright 2012 Project FiFo / Heinz N. Gies
         exec='/opt/local/leo_manager/bin/leo_manager %m'
         timeout_seconds='30'>
       <method_context>
-        <method_credential user='leofs' group='leofs' />
+        <!--method_credential user='leofs' group='leofs' /-->
         <method_environment>
           <envvar name='PATH' value='/opt/local/gnu/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/usr/sbin'/>
           <envvar name='HOME' value='/var/db/leo_manager'/>
@@ -62,7 +62,7 @@ Copyright 2012 Project FiFo / Heinz N. Gies
         exec='/opt/local/leo_manager/bin/leo_manager %m'
         timeout_seconds='120'>
       <method_context>
-        <method_credential user='leofs' group='leofs' />
+        <!--method_credential user='leofs' group='leofs' /-->
         <method_environment>
           <envvar name='PATH' value='/opt/local/gnu/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/usr/sbin'/>
           <envvar name='HOME' value='/var/db/leo_manager'/>
@@ -77,7 +77,7 @@ Copyright 2012 Project FiFo / Heinz N. Gies
         exec='/opt/local/leo_manager/bin/leo_manager %m'
         timeout_seconds='120'>
       <method_context>
-        <method_credential user='leofs' group='leofs' />
+        <!--method_credential user='leofs' group='leofs' /-->
         <method_environment>
           <envvar name='PATH' value='/opt/local/gnu/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/usr/sbin'/>
           <envvar name='HOME' value='/var/db/leo_manager'/>

diff --git a/pkg/leo_storage/Makefile b/pkg/leo_storage/Makefile
@@ -1,4 +1,5 @@
-VERSION=0.14.9
+include ../../leofs.mk
+VERSION=$(LEOFS_VERSION)
 COMPONENT_INTERNAL=leo_storage
 COMPONENT=leo_storage
 COMPONENT_PATH=../../package/$(COMPONENT_INTERNAL)

diff --git a/pkg/leo_storage/files/app.config b/pkg/leo_storage/files/app.config
@@ -31,7 +31,7 @@
 
     {leo_storage, [
                    %% == System Ver ==
-                   {system_version, "0.14.9" },
+                   {system_version, "0.16.0" },
 
                    %% == Storage Configuration ==
                    %%

diff --git a/pkg/leo_storage/files/leo_storage.xml b/pkg/leo_storage/files/leo_storage.xml
@@ -47,7 +47,7 @@ Copyright 2012 Project FiFo / Heinz N. Gies
         exec='/opt/local/leo_storage/bin/leo_storage %m'
         timeout_seconds='30'>
       <method_context>
-        <method_credential user='leofs' group='leofs' />
+        <!--method_credential user='leofs' group='leofs' /-->
         <method_environment>
           <envvar name='PATH' value='/opt/local/gnu/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/usr/sbin'/>
           <envvar name='HOME' value='/var/db/leo_storage'/>
@@ -62,7 +62,7 @@ Copyright 2012 Project FiFo / Heinz N. Gies
         exec='/opt/local/leo_storage/bin/leo_storage %m'
         timeout_seconds='120'>
       <method_context>
-        <method_credential user='leofs' group='leofs' />
+        <!--method_credential user='leofs' group='leofs' /-->
         <method_environment>
           <envvar name='PATH' value='/opt/local/gnu/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/usr/sbin'/>
           <envvar name='HOME' value='/var/db/leo_storage'/>
@@ -77,7 +77,7 @@ Copyright 2012 Project FiFo / Heinz N. Gies
         exec='/opt/local/leo_storage/bin/leo_storage %m'
         timeout_seconds='120'>
       <method_context>
-        <method_credential user='leofs' group='leofs' />
+        <!--method_credential user='leofs' group='leofs' /-->
         <method_environment>
           <envvar name='PATH' value='/opt/local/gnu/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/usr/sbin'/>
           <envvar name='HOME' value='/var/db/leo_storage'/>

diff --git a/priv/test/app-g0.config b/priv/test/app-g0.config
@@ -3,7 +3,7 @@
 %%
 %% LeoFS Gateway
 %%
-%% Copyright (c) 2012 Rakuten, Inc.
+%% Copyright (c) 2012-2013 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -31,7 +31,7 @@
 
  {leo_gateway, [
                 %% System Ver
-                {system_version, "0.16.0" },
+                {system_version, "0.16.5" },
 
                 %% Gateway Properties:
                 {http, [

diff --git a/priv/test/app-g1.config b/priv/test/app-g1.config
@@ -3,7 +3,7 @@
 %%
 %% LeoFS Gateway
 %%
-%% Copyright (c) 2012 Rakuten, Inc.
+%% Copyright (c) 2012-2013 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -31,7 +31,7 @@
 
  {leo_gateway, [
                 %% System Ver
-                {system_version, "0.16.0" },
+                {system_version, "0.16.5" },
 
                 %% Gateway Properties:
                 {http, [

diff --git a/priv/test/app-m0.config b/priv/test/app-m0.config
@@ -3,7 +3,7 @@
 %%
 %% LeoFS Manager
 %%
-%% Copyright (c) 2012 Rakuten, Inc.
+%% Copyright (c) 2012-2013 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -35,7 +35,7 @@
              ]},
     {leo_manager, [
                    %% == System Ver ==
-                   {system_version, "0.16.0" },
+                   {system_version, "0.16.5" },
 
                    %% == System Configuration ==
                    %%

diff --git a/priv/test/app-s0.config b/priv/test/app-s0.config
@@ -3,7 +3,7 @@
 %%
 %% LeoFS Storage
 %%
-%% Copyright (c) 2012 Rakuten, Inc.
+%% Copyright (c) 2012-2013 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -31,7 +31,7 @@
 
     {leo_storage, [
                    %% == System Ver ==
-                   {system_version, "0.16.0" },
+                   {system_version, "0.16.5" },
 
                    %% == Storage Configuration ==
                    %%

diff --git a/priv/test/app-s1.config b/priv/test/app-s1.config
@@ -3,7 +3,7 @@
 %%
 %% LeoFS Storage
 %%
-%% Copyright (c) 2012 Rakuten, Inc.
+%% Copyright (c) 2012-2013 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -31,7 +31,7 @@
 
     {leo_storage, [
                    %% == System Ver ==
-                   {system_version, "0.16.0" },
+                   {system_version, "0.16.5" },
 
                    %% == Storage Configuration ==
                    %%

diff --git a/priv/test/app-s2.config b/priv/test/app-s2.config
@@ -3,7 +3,7 @@
 %%
 %% LeoFS Storage
 %%
-%% Copyright (c) 2012 Rakuten, Inc.
+%% Copyright (c) 2012-2013 Rakuten, Inc.
 %%
 %% This file is provided to you under the Apache License,
 %% Version 2.0 (the "License"); you may not use this file
@@ -31,7 +31,7 @@
 
     {leo_storage, [
                    %% == System Ver ==
-                   {system_version, "0.16.0" },
+                   {system_version, "0.16.5" },
 
                    %% == Storage Configuration ==
                    %%