diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/.gitignore | 4 | ||||
| -rw-r--r-- | docker/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/Makefile | 6 |
3 files changed, 11 insertions, 0 deletions
diff --git a/docker/.gitignore b/docker/.gitignore new file mode 100644 index 0000000..1ea3b1c --- /dev/null +++ b/docker/.gitignore @@ -0,0 +1,4 @@ +dserver +mapr_testdata.log +log +*.csv diff --git a/docker/Dockerfile b/docker/Dockerfile index 779f75d..da3b0db 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,6 +7,7 @@ RUN mkdir -p /etc/dserver /var/run/dserver/ /var/log/dserver ADD ./dtail.json /etc/dserver/dtail.json ADD ./dserver /usr/local/bin/dserver +ADD ./mapr_testdata.log /var/log/mapr_testdata.log RUN useradd dserver RUN chown -R dserver /var/run/dserver /var/log/dserver diff --git a/docker/Makefile b/docker/Makefile index 28d458a..5cdb931 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -2,6 +2,7 @@ all: build testrun: build spinup dcat spindown serverfarm: spindown build spinup build: + cp ../testdata/mapr_testdata.log . cp ../dserver . docker build . -t dserver:develop rm ./dserver @@ -17,5 +18,10 @@ dcat: ../dcat --servers serverlist.txt --files '/etc/passwd' --trustAllHosts --debug 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)' +dmap2: + ../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 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-B.csv' + @echo Expecting zero diff! + diff -u <(sort dmap2-A.csv) <(sort dmap2-B.csv) spinup1: docker run -p 2222:2222 dserver:develop |