Miscellaneous trivial fixes

.gitignore

@@ -1,3 +1,3 @@
 *.pyc
-.idea/
-pom.xml
+/.idea/
+/pom.xml

README.md

@@ -36,7 +36,7 @@ Muchos requires the following:
 
 The following commands will install Muchos, launch an EC2 cluster, and setup/run Accumulo:
 
-```bash
+```sh
 git clone https://github.com/apache/fluo-muchos.git
 cd fluo-muchos/
 cp conf/muchos.props.example conf/muchos.props
@@ -49,13 +49,13 @@ The `setup` command can be run repeatedly to fix any failures and will not repea
 
 After your cluster is launched, SSH to it using the following command:
 
-```bash
+```sh
 ./bin/muchos ssh
 ```
 
 Run the following command to terminate your cluster. WARNING: All cluster data will be lost.
 
-```bash
+```sh
 ./bin/muchos terminate
 ```
 
@@ -167,7 +167,7 @@ Running an example Fluo application like [WebIndex], [Phrasecount], or [Stresso]
 with Muchos as it configures your shell with common environment variables. To run an example
 application, SSH to a node on cluster where Fluo is installed and clone the example repo:
 
-```bash
+```sh
 ./bin/muchos ssh # SSH to cluster proxy node
 ssh <node where Fluo is installed> # Nodes with Fluo installed is determined by Muchos config
 hub clone apache/fluo-examples # Clone repo of Fluo example applications. Press enter for user/password.
@@ -177,7 +177,7 @@ Start the example application using its provided scripts. To show how simple th
 to run the [WebIndex] application are shown below. Read the [WebIndex] README to learn more
 before running these commands.
 
-```bash
+```sh
 cd fluo-examples/webindex
 ./bin/webindex init # Initialize and start webindex Fluo application
 ./bin/webindex getpaths 2015-18 # Retrieves CommonCrawl paths file for 2015-18 crawl
@@ -212,7 +212,7 @@ With the default configuration, EC2 clusters will not shutdown automatically aft
 shutdown behavior will be stopping the node. If you would like your cluster to terminate after 8 hours,
 set the following configuration in [muchos.props]:
 
-```
+```ini
 shutdown_delay_minutes = 480
 shutdown_behavior = terminate
 ```
@@ -223,7 +223,7 @@ If you decide later to cancel the shutdown, run `muchos cancel_shutdown`.
 
 The `config` command allows you to retrieve cluster configuration for your own scripts:
 
-```bash
+```sh
 $ ./bin/muchos config -p leader.public.ip
 10.10.10.10
 ```

ansible/.gitignore

@@ -1 +1 @@
-site.yml
+/site.yml

ansible/conf/.gitignore

@@ -1,2 +1,2 @@
-hosts
-keys
+/hosts
+/keys

ansible/group_vars/.gitignore

@@ -1 +1 @@
-all
+/all

ansible/roles/accumulo/tasks/main.yml

@@ -56,8 +56,8 @@
 - name: "configure tservers using managed templates"
  template: src=tservers dest={{ accumulo_home }}/conf/{{ accumulo_tservers_fn[accumulo_major_version] }}
 - name: "build accumulo native libraries"
- shell: "{{ accumulo_build_native_cmd[accumulo_major_version] }}" 
- args: 
+ 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

ansible/roles/accumulo/templates/log4j-service.properties

@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file 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.
+#
+
 log4j.appender.file=org.apache.log4j.RollingFileAppender
 log4j.appender.file.File=${accumulo.log.dir}/${accumulo.application}.log
 log4j.appender.file.MaxFileSize=1000MB

ansible/roles/common/tasks/main.yml

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-- name: "enable epel yum repo" 
+- name: "enable epel yum repo"
  yum: name=epel-release state=present
 - name: "install packages"
  yum:

ansible/roles/common/tasks/ssh.yml

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-- name: "ensure cluster user exists but don't generate ssh key" 
+- name: "ensure cluster user exists but don't generate ssh key"
  user: name={{ cluster_user }} generate_ssh_key=no state=present
 - name: "copy cluster private key to all nodes"
  copy: src=/home/{{ cluster_user }}/.ssh/id_rsa dest=/home/{{ cluster_user }}/.ssh/id_rsa owner={{ cluster_user }} group={{ cluster_group }} mode=0600

ansible/roles/fluo/templates/fluo-app.properties

@@ -20,7 +20,7 @@
 #############################
 
 # NOTE - All properties that have a default are set with it. Uncomment
-# a property if you want to use a value different than the default. 
+# a property if you want to use a value different than the default.
 # Properties that have no default are uncommented and must be set by
 # the user.
 
@@ -29,7 +29,7 @@
 ## Specifies an observer provider. This should be the name of a class that
 ## implements org.apache.fluo.api.observer.ObserverProvider.
 #fluo.observer.provider=com.foo.AppObserverProvider
-## Observer jars in this directory are copied to the DFS (specified by fluo.dfs.root) during initialization. 
+## Observer jars in this directory are copied to the DFS (specified by fluo.dfs.root) during initialization.
 ## If this property is set, fluo.observer.jars.url should not be set.
 #fluo.observer.init.dir=/path/to/observer/jars/
 ## Observer jars are retreived from this URL. If set, fluo.observer.init.dir should not be set.

ansible/roles/fluo/templates/fluo-conn.properties

@@ -20,7 +20,7 @@
 ############################
 
 # NOTE - All properties that have a default are set with it. Uncomment
-# a property if you want to use a value different than the default. 
+# a property if you want to use a value different than the default.
 # Properties that have no default are uncommented and must be set by
 # the user.
 

ansible/roles/fluo/templates/fluo.properties

@@ -20,7 +20,7 @@
 #################
 
 # NOTE - All properties that have a default are set with it. Uncomment
-# a property if you want to use a value different than the default. 
+# a property if you want to use a value different than the default.
 # Properties that have no default are uncommented and must be set by
 # the user. Most are unset except for fluo.accumulo.classpath which
 # has a suggested value.

ansible/roles/fluo_yarn/templates/fluo-yarn.properties

@@ -20,7 +20,7 @@
 ########################
 
 # NOTE - All properties that have a default are set with it. Uncomment
-# a property if you want to use a value different than the default. 
+# a property if you want to use a value different than the default.
 # Properties that have no default are uncommented and must be set by
 # the user.
 

ansible/roles/grafana/tasks/main.yml

@@ -16,8 +16,8 @@
 #
 
 - name: "download grafana rpm"
- get_url: 
- args: 
+ get_url:
+ args:
  url: https://grafanarel.s3.amazonaws.com/builds/{{ grafana_rpm }}
  dest: /tmp/{{ grafana_rpm }}
  sha256sum: "{{ grafana_sha256 }}"

ansible/roles/hadoop/templates/core-site.xml

@@ -23,7 +23,7 @@
 
 <configuration>
  <property>
- <name>fs.defaultFS</name> 
+ <name>fs.defaultFS</name>
  <value>{{ hdfs_root }}</value>
  </property>
  <property>

ansible/roles/hadoop/templates/hdfs-site.xml

@@ -18,19 +18,6 @@
  limitations under the License.
 
 -->
-<!--
- Licensed 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. See accompanying LICENSE file.
--->
 
 <!-- Put site-specific property overrides in this file. -->
 
@@ -45,8 +32,8 @@
  </property>
  <property>
  <name>dfs.datanode.data.dir</name>
- <value>{% for dir in worker_data_dirs -%} 
- {{ dir }}/hadoop/data 
+ <value>{% for dir in worker_data_dirs -%}
+ {{ dir }}/hadoop/data
  {%- if not loop.last -%} , {%- endif -%}
  {%- endfor %}</value>
  </property>

ansible/roles/hadoop/templates/mapred-site.xml

@@ -28,14 +28,14 @@
  </property>
  <property>
  <name>mapreduce.cluster.temp.dir</name>
- <value>{% for dir in worker_data_dirs -%} 
+ <value>{% for dir in worker_data_dirs -%}
  {{ dir }}/hadoop/mapred/temp
  {%- if not loop.last -%} , {%- endif -%}
  {%- endfor %}</value>
  </property>
  <property>
  <name>mapreduce.cluster.local.dir</name>
- <value>{% for dir in worker_data_dirs -%} 
+ <value>{% for dir in worker_data_dirs -%}
  {{ dir }}/hadoop/mapred/local
  {%- if not loop.last -%} , {%- endif -%}
  {%- endfor %}</value>

ansible/roles/hadoop/templates/yarn-site.xml

@@ -18,19 +18,6 @@
  limitations under the License.
 
 -->
-<!--
- Licensed 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. See accompanying LICENSE file.
--->
 
 <!-- Put site-specific property overrides in this file. -->
 
@@ -41,7 +28,7 @@
  </property>
  <property>
  <name>yarn.nodemanager.local-dirs</name>
- <value>{% for dir in worker_data_dirs -%} 
+ <value>{% for dir in worker_data_dirs -%}
  {{ dir }}/hadoop/yarn/local
  {%- if not loop.last -%} , {%- endif -%}
  {%- endfor %}</value>

ansible/roles/influxdb/tasks/main.yml

@@ -17,7 +17,7 @@
 
 - name: "download influxdb rpm"
  get_url:
- args: 
+ args:
  url: https://influxdb.s3.amazonaws.com/{{ influxdb_rpm }}
  dest: /tmp/{{ influxdb_rpm }}
  sha256sum: "{{ influxdb_sha256 }}"

ansible/roles/proxy/tasks/download.yml

@@ -31,4 +31,4 @@
  - { urlp: "{{ apache_mirror.stdout }}/zookeeper/zookeeper-{{ zookeeper_version }}", fn: "{{ zookeeper_tarball }}", sum: "{{ zookeeper_sha256 }}" }
  - { urlp: "{{ apache_mirror.stdout }}/hadoop/common/hadoop-{{ hadoop_version }}", fn: "{{ hadoop_tarball }}", sum: "{{ hadoop_sha256 }}" }
  - { urlp: "{{ apache_mirror.stdout }}/maven/maven-3/{{ maven_version }}/binaries", fn: "{{ maven_tarball }}", sum: "{{ maven_sha256 }}" }
- - { urlp: "https://github.com/github/hub/releases/download/v{{ hub_version }}", fn: "{{ hub_tarball }}", sum: "{{ hub_sha256 }}" } 
+ - { urlp: "https://github.com/github/hub/releases/download/v{{ hub_version }}", fn: "{{ hub_tarball }}", sum: "{{ hub_sha256 }}" }

ansible/roles/proxy/tasks/main.yml

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-- name: "ensure cluster user exists and generate ssh key" 
+- name: "ensure cluster user exists and generate ssh key"
  user: name={{ cluster_user }} generate_ssh_key=yes ssh_key_bits=4096 state=present
  become: yes
 - name: "create tarball directory on proxy"

ansible/roles/spark/tasks/start-spark-history.yml

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-- name: "ensure spark history directory exists in hdfs" 
+- name: "ensure spark history directory exists in hdfs"
  command: "{{ hadoop_home}}/bin/hdfs dfs -mkdir -p /spark/history"
  register: mk_hist_dir
  changed_when: mk_hist_dir.rc != 0

ansible/roles/zookeeper/templates/zoo.cfg

@@ -1,13 +1,13 @@
 # The number of milliseconds of each tick
 tickTime=2000
-# The number of ticks that the initial 
+# The number of ticks that the initial
 # synchronization phase can take
 initLimit=10
-# The number of ticks that can pass between 
+# The number of ticks that can pass between
 # sending a request and getting an acknowledgement
 syncLimit=5
 # the directory where the snapshot is stored.
-# do not use /tmp for storage, /tmp here is just 
+# do not use /tmp for storage, /tmp here is just
 # example sakes.
 dataDir={{ default_data_dirs[0] }}/zookeeper
 # the port at which the clients will connect

conf/.gitignore

@@ -1,4 +1,4 @@
-muchos.props*
-hosts/*
-keys
-user_data
+/muchos.props*
+/hosts/*
+/keys
+/user_data