This is an automated email from the ASF dual-hosted git repository.
arvindsh 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 73d02f6 Patch fluo-env.sh to correctly use system Hadoop (#357)
73d02f6 is described below
commit 73d02f69451a08ac203cedb3ad4c2e0c3bc69d9a
Author: Arvind Shyamsundar <[email protected]>
AuthorDate: Wed Jul 15 20:56:39 2020 -0700
Patch fluo-env.sh to correctly use system Hadoop (#357)
Add equivalent actions to those fixed in [Fluo PR
1101](https://github.com/apache/fluo/pull/1101)
---
ansible/roles/fluo/tasks/main.yml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/ansible/roles/fluo/tasks/main.yml
b/ansible/roles/fluo/tasks/main.yml
index 7d88f62..b3ba1c3 100644
--- a/ansible/roles/fluo/tasks/main.yml
+++ b/ansible/roles/fluo/tasks/main.yml
@@ -39,3 +39,15 @@
command: "{{ fluo_home }}/lib/fetch.sh extra"
- name: "set correct owner & group"
file: path={{ fluo_home }} recurse=yes owner={{ cluster_user }} group={{
cluster_group }}
+- name: "Add Hadoop conf folder to fluo classpath (fluo version == 1.2.0)"
+ replace:
+ path: "{{ fluo_home }}/conf/fluo-env.sh"
+ regexp: '# If fluo-conn.properties exists, then classpath does not need to
include twill or logback'
+ replace: 'CLASSPATH="$CLASSPATH:$HADOOP_PREFIX/etc/hadoop"\n# If
fluo-conn.properties exists, then classpath does not need to include twill or
logback'
+ when: fluo_version == '1.2.0'
+- name: "Add Hadoop native lib folder to fluo system lib load path (fluo
version == 1.2.0)"
+ replace:
+ path: "{{ fluo_home }}/conf/fluo-env.sh"
+ regexp: 'export JAVA_OPTS'
+ replace: 'export JAVA_OPTS\ncase "$(uname)" in\n Darwin) export
DYLD_LIBRARY_PATH="${HADOOP_PREFIX}/lib/native:${DYLD_LIBRARY_PATH}" ;;\n *)
export LD_LIBRARY_PATH="${HADOOP_PREFIX}/lib/native:${LD_LIBRARY_PATH}"
;;\nesac'
+ when: fluo_version == '1.2.0'
