[fluo-muchos] branch master updated: Log to ephemeral drive (#217)

[ct...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/fluo-muchos.git


The following commit(s) were added to refs/heads/master by this push:
     new b34ae81  Log to ephemeral drive (#217)
b34ae81 is described below

commit b34ae81a5bef961ee0d1d7f23e9c3f464e916160
Author: Keith Turner <ke...@deenlo.com>
AuthorDate: Thu May 3 19:28:42 2018 -0400

    Log to ephemeral drive (#217)
---
 ansible/roles/accumulo/tasks/main.yml              |  2 ++
 ansible/roles/accumulo/templates/accumulo-env.sh   |  2 +-
 ansible/roles/hadoop/tasks/main.yml                |  8 ++++++++
 ansible/roles/zookeeper/tasks/main.yml             |  2 ++
 ansible/roles/zookeeper/templates/zookeeper-env.sh |  2 +-
 conf/muchos.props.example                          | 12 ++++++------
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ansible/roles/accumulo/tasks/main.yml b/ansible/roles/accumulo/tasks/main.yml
index 768c32b..e5e64de 100644
--- a/ansible/roles/accumulo/tasks/main.yml
+++ b/ansible/roles/accumulo/tasks/main.yml
@@ -29,3 +29,5 @@
   shell: "{{ accumulo_build_native_cmd[accumulo_major_version] }}" 
   args: 
     creates: "{{ accumulo_home }}/lib/native/libaccumulo.so"
+- name: "Create accumulo log dir"
+  file: path={{ worker_data_dirs[0] }}/logs/accumulo state=directory
diff --git a/ansible/roles/accumulo/templates/accumulo-env.sh b/ansible/roles/accumulo/templates/accumulo-env.sh
index 752f8e9..ca64e7f 100755
--- a/ansible/roles/accumulo/templates/accumulo-env.sh
+++ b/ansible/roles/accumulo/templates/accumulo-env.sh
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-export ACCUMULO_LOG_DIR={{ accumulo_home }}/logs
+export ACCUMULO_LOG_DIR={{ worker_data_dirs[0] }}/logs/accumulo
 export HADOOP_PREFIX={{ hadoop_prefix }}
 export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop"
 export ZOOKEEPER_HOME={{ zookeeper_home }}
diff --git a/ansible/roles/hadoop/tasks/main.yml b/ansible/roles/hadoop/tasks/main.yml
index 97e83dd..23ef7e7 100644
--- a/ansible/roles/hadoop/tasks/main.yml
+++ b/ansible/roles/hadoop/tasks/main.yml
@@ -13,3 +13,11 @@
 - name: "setup hadoop short circuit socket dir"
   file: path=/var/lib/hadoop-hdfs state=directory owner={{ cluster_user }} group={{ cluster_user }} mode=0755
   become: yes
+- name: "Configure hadoop log dir"
+  replace:
+    path: "{{ hadoop_prefix }}/etc/hadoop/hadoop-env.sh"
+    regexp: '.*export\s+HADOOP_LOG_DIR.*'
+    replace: "export HADOOP_LOG_DIR={{ worker_data_dirs[0] }}/logs/hadoop"
+- name: "Create hadoop log dir"
+  file: path={{ worker_data_dirs[0] }}/logs/hadoop state=directory
+
diff --git a/ansible/roles/zookeeper/tasks/main.yml b/ansible/roles/zookeeper/tasks/main.yml
index 76b96e9..7603990 100644
--- a/ansible/roles/zookeeper/tasks/main.yml
+++ b/ansible/roles/zookeeper/tasks/main.yml
@@ -5,3 +5,5 @@
   with_items:
     - zoo.cfg
     - zookeeper-env.sh
+- name: "Create zookeeper log dir"
+  file: path={{ worker_data_dirs[0] }}/logs/zookeeper state=directory
diff --git a/ansible/roles/zookeeper/templates/zookeeper-env.sh b/ansible/roles/zookeeper/templates/zookeeper-env.sh
index 2c1bc68..32ac054 100644
--- a/ansible/roles/zookeeper/templates/zookeeper-env.sh
+++ b/ansible/roles/zookeeper/templates/zookeeper-env.sh
@@ -1 +1 @@
-export ZOO_LOG_DIR={{ zookeeper_home }}
+export ZOO_LOG_DIR={{ worker_data_dirs[0] }}/logs/zookeeper
diff --git a/conf/muchos.props.example b/conf/muchos.props.example
index a9a89d2..0dabd67 100644
--- a/conf/muchos.props.example
+++ b/conf/muchos.props.example
@@ -34,19 +34,19 @@ accumulo_instance = muchos
 # Accumluo Password
 accumulo_password = secret
 # Software versions
-hadoop_version = 2.7.5
-zookeeper_version = 3.4.11
+hadoop_version = 2.8.3
+zookeeper_version = 3.4.12
 spark_version = 1.6.3
 fluo_version = 1.2.0
 fluo_yarn_version = 1.0.0
-accumulo_version = 1.8.1
+accumulo_version = 1.9.0
 # Software sha256 checksums
-hadoop_sha256 = 0bfc4d9b04be919be2fdf36f67fa3b4526cdbd406c512a7a1f5f1b715661f831
-zookeeper_sha256 = f6bd68a1c8f7c13ea4c2c99f13082d0d71ac464ffaf3bf7a365879ab6ad10e84
+hadoop_sha256 = e8bf9a53337b1dca3b152b0a5b5e277dc734e76520543e525c301a050bb27eae
+zookeeper_sha256 = c686f9319050565b58e642149cb9e4c9cc8c7207aacc2cb70c5c0672849594b9
 spark_sha256 = d13358a2d45e78d7c8cf22656d63e5715a5900fab33b3340df9e11ce3747e314
 fluo_sha256 = 037f89cd2bfdaf76a1368256c52de46d6b9a85c9c1bfc776ec4447d02c813fb2
 fluo_yarn_sha256 = c6220d35cf23127272f3b5638c44586504dc17a46f5beecdfee5027b5ff874b0
-accumulo_sha256 = eba3bfe823935ca7901ea7c2bd59c84a68b9381361699c7e260bbd9191f237f4
+accumulo_sha256 = f68a6145029a9ea843b0305c90a7f5f0334d8a8ceeea94734267ec36421fe7fe
 
 [ec2]
 # Type of AWS instance launched by default

-- 
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.