This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git
The following commit(s) were added to refs/heads/master by this push:
new f491c91 Drop example files (#100)
f491c91 is described below
commit f491c91817c24ac36fa9ff316b4d07114b237a5f
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Aug 15 17:51:29 2019 -0400
Drop example files (#100)
* Drop .example files
* Remove references to these files from documentation
---
Dockerfile | 1 -
README.md | 7 +++----
bin/build | 10 +++-------
bin/performance | 7 ++-----
conf/.gitignore | 3 ---
...-testing.properties.example => accumulo-testing.properties} | 0
conf/{env.sh.example => env.sh} | 7 ++-----
conf/{log4j.properties.example => log4j.properties} | 0
test/scalability/README.md | 8 ++++----
test/scalability/conf/{Ingest.conf.example => Ingest.conf} | 0
test/scalability/conf/{site.conf.example => site.conf} | 0
test/stress/README.md | 7 +++----
test/stress/{stress-env.sh.example => stress-env.sh} | 0
13 files changed, 17 insertions(+), 33 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 2437f66..8c86058 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,6 @@ RUN mkdir /opt/at/conf
COPY ./conf/accumulo-client.properties /opt/at/conf/
COPY ./conf/accumulo-testing.properties /opt/at/conf/
COPY ./conf/log4j.properties* /opt/at/conf/
-RUN if [[ ! -f /opt/at/conf/log4j.properties ]]; then mv
/opt/at/conf/log4j.properties.example /opt/at/conf/log4j.properties; fi
RUN touch /opt/at/conf/env.sh
COPY ./bin/cingest /opt/at/bin
diff --git a/README.md b/README.md
index f393aa2..88b0009 100644
--- a/README.md
+++ b/README.md
@@ -15,12 +15,11 @@ on your machine as well as an Accumulo instance to use for
testing.
cd accumulo-testing
2. All configuation files for the test suite are in `conf/`. Only the
`accumulo-testing.properties`
- configuration file needs to be created and edited as all other
configuration files are optional.
+ configuration file needs to be edited as all other configuration files are
optional.
In `accumulo-testing.properites`, review the properties with
`test.common.*` prefix as these are
used by all tests.
cd conf/
- cp accumulo-testing.properties.example accumulo-testing.properties
vim accumulo-testing.properties
@@ -47,8 +46,8 @@ run in Docker:
1. To create the `accumulo-testing` docker image, make sure the following
files exist in your clone:
- * `conf/accumulo-client.properties` - Copy and configure this from your
Accumulo install
- * `conf/accumulo-testing.properties` - Copy this from the example file and
configure it
+ * `conf/accumulo-client.properties` - Configure this file from your
Accumulo install
+ * `conf/accumulo-testing.properties` - Configure this file for testing
* `target/accumulo-testing-2.0.0-SNAPSHOT-shaded.jar` - Can be created
using `./bin/build`
Run the following command to create the image. `HADOOP_HOME` should be
where Hadoop is installed on your cluster.
diff --git a/bin/build b/bin/build
index 457e87a..d5d178e 100755
--- a/bin/build
+++ b/bin/build
@@ -18,10 +18,6 @@
bin_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
at_home=$( cd "$( dirname "$bin_dir" )" && pwd )
-if [ -f "$at_home/conf/env.sh" ]; then
- conf="$at_home/conf/env.sh"
-else
- conf="$at_home/conf/env.sh.example"
-fi
-echo "Using $conf for setup"
-source $conf
+env_sh="$at_home/conf/env.sh"
+echo "Using $env_sh for setup"
+source $env_sh
diff --git a/bin/performance b/bin/performance
index b6ed57c..6b5f25d 100755
--- a/bin/performance
+++ b/bin/performance
@@ -45,11 +45,8 @@ function build_shade_jar() {
log4j_config="$at_home/conf/log4j.properties"
if [ ! -f "$log4j_config" ]; then
- log4j_config="$at_home/conf/log4j.properties.example"
- if [ ! -f "$log4j_config" ]; then
- echo "Could not find logj4.properties or log4j.properties.example in
$at_home/conf"
- exit 1
- fi
+ echo "Could not find logj4.properties in $at_home/conf"
+ exit 1
fi
diff --git a/conf/.gitignore b/conf/.gitignore
index bd1d6b3..b0aa095 100644
--- a/conf/.gitignore
+++ b/conf/.gitignore
@@ -1,5 +1,2 @@
/accumulo-client.properties
-/accumulo-testing.properties
-/env.sh
-/log4j.properties
/cluster-control.sh
diff --git a/conf/accumulo-testing.properties.example
b/conf/accumulo-testing.properties
similarity index 100%
rename from conf/accumulo-testing.properties.example
rename to conf/accumulo-testing.properties
diff --git a/conf/env.sh.example b/conf/env.sh
similarity index 95%
rename from conf/env.sh.example
rename to conf/env.sh
index 808ad1e..c5582e3 100644
--- a/conf/env.sh.example
+++ b/conf/env.sh
@@ -52,11 +52,8 @@ if [ ! -f "$TEST_PROPS" ]; then
fi
export TEST_LOG4J="${conf_dir}/log4j.properties"
if [ ! -f "$TEST_LOG4J" ]; then
- export TEST_LOG4J="${conf_dir}/log4j.properties.example"
- if [ ! -f "$TEST_LOG4J" ]; then
- echo "Could not find logj4.properties or log4j.properties.example in
$conf_dir"
- exit 1
- fi
+ echo "Could not find logj4.properties in $conf_dir"
+ exit 1
fi
# Shaded test jar
diff --git a/conf/log4j.properties.example b/conf/log4j.properties
similarity index 100%
rename from conf/log4j.properties.example
rename to conf/log4j.properties
diff --git a/test/scalability/README.md b/test/scalability/README.md
index 4f287d2..a677b0b 100644
--- a/test/scalability/README.md
+++ b/test/scalability/README.md
@@ -28,16 +28,16 @@ data.
1. Make sure you have both `ACCUMULO_HOME` and `HADOOP_HOME` set in your
`$ACCUMULO_CONF_DIR/accumulo-env.sh.`
-2. Create a 'site.conf' file in the `conf` directory containing settings
+2. Edit the 'site.conf' file in the `conf` directory containing settings
needed by test nodes to connect to Accumulo, and to guide the tests.
- `$ cp conf/site.conf.example conf/site.conf`
+ `$ vim conf/site.conf`
-3. Create an 'Ingest.conf' file in the `conf` directory containing performance
+3. Edit the 'Ingest.conf' file in the `conf` directory containing performance
settings for the Ingest test. (This test is currently the only scalability
test available.)
- `$ cp conf/Ingest.conf.example conf/Ingest.conf`
+ `$ vim conf/Ingest.conf`
Each test has a unique ID (e.g., "Ingest") which correlates with its test
code in:
diff --git a/test/scalability/conf/Ingest.conf.example
b/test/scalability/conf/Ingest.conf
similarity index 100%
rename from test/scalability/conf/Ingest.conf.example
rename to test/scalability/conf/Ingest.conf
diff --git a/test/scalability/conf/site.conf.example
b/test/scalability/conf/site.conf
similarity index 100%
rename from test/scalability/conf/site.conf.example
rename to test/scalability/conf/site.conf
diff --git a/test/stress/README.md b/test/stress/README.md
index 9eb9fdc..19fb08a 100644
--- a/test/stress/README.md
+++ b/test/stress/README.md
@@ -55,10 +55,9 @@ to install pssh on the machines that will be controlled by
them.
## Running
-Copy `stress-env.sh.example` to `stress-env.sh` and edit it, supplying at least
-correct values for the USERPASS and INSTANCE variables. The remainder of this
-file describes and provides defaults for many of the configuration options
-for the stress utilities.
+Edit the script `stress-env.sh`, supplying at least correct values for the
+USERPASS and INSTANCE variables. The remainder of this file describes and
+provides defaults for many of the configuration options for the stress
utilities.
### Individual Execution
diff --git a/test/stress/stress-env.sh.example b/test/stress/stress-env.sh
similarity index 100%
rename from test/stress/stress-env.sh.example
rename to test/stress/stress-env.sh
