summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/.gitignore5
-rw-r--r--docker/Makefile5
-rw-r--r--docker/dtail.json2
3 files changed, 5 insertions, 7 deletions
diff --git a/docker/.gitignore b/docker/.gitignore
index ef60a31..e69de29 100644
--- a/docker/.gitignore
+++ b/docker/.gitignore
@@ -1,5 +0,0 @@
-dserver
-mapr_testdata.log
-log
-*.csv
-*.out
diff --git a/docker/Makefile b/docker/Makefile
index 71fd249..c89467c 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -18,7 +18,10 @@ dgrep:
../dgrep --servers serverlist.txt --files '/var/log/dserver/*' --regex MAPREDUCE --trustAllHosts
dcat:
../dcat --servers serverlist.txt --files '/etc/passwd' --trustAllHosts
+dcat_notrust:
+ ../dcat --servers serverlist.txt --files '/etc/passwd'
dcat2:
+ # TODO: All serverless tests in this Makefile have to move to actual unit tests
../dcat /etc/passwd
dmap:
../dmap --servers serverlist.txt --files '/var/log/dserver/*' --trustAllHosts --query 'from stats select avg(goroutines),max(goroutines),min(goroutines),last(goroutines),count($$hostname),$$hostname group by $$hostname order by avg(goroutines)'
@@ -30,7 +33,7 @@ dmap2:
diff -u <(sort dmap2-A.csv) <(sort dmap2-B.csv)
diff -u <(sort dmap2-A.csv) <(sort dmap2-serverless.csv)
dmap3:
- ../dmap --servers serverlist.txt --files '/var/log/mapr_testdata.log' --trustAllHosts --query 'from stats select count($$time),last($$time) group by $$time order by count($$time) outfile dmap2-A.csv'
+ ../dmap --servers <(head -n 1 serverlist.txt) --files '/var/log/mapr_testdata.log' --trustAllHosts --query 'from stats select count($$time),last($$time) group by $$time order by count($$time) outfile dmap2-A.csv'
../dmap --query 'from stats select count($$time),last($$time) group by $$time order by count($$time) outfile dmap2-serverless.csv' ./mapr_testdata.log
@echo Expecting zero diff!
diff -u <(sort dmap2-A.csv) <(sort dmap2-serverless.csv)
diff --git a/docker/dtail.json b/docker/dtail.json
index d923101..badd42f 100644
--- a/docker/dtail.json
+++ b/docker/dtail.json
@@ -33,7 +33,7 @@
"TmpDir" : "tmp",
"LogStrategy": "daily",
"SSHPort": 2222,
- "DebugEnable": true,
+ "LogLevel": "DEVEL",
"ExperimentalFeaturesEnable": false
}
}