diff options
Diffstat (limited to 'etc/perf.yml')
-rw-r--r-- | etc/perf.yml | 49 |
1 files changed, 17 insertions, 32 deletions
diff --git a/etc/perf.yml b/etc/perf.yml index dddb4a05c4a..d2c2eac72eb 100644 --- a/etc/perf.yml +++ b/etc/perf.yml @@ -77,24 +77,16 @@ functions: params: aws_key: ${aws_key} aws_secret: ${aws_secret} - remote_file: ${project}/${version_id}/${revision}/mongod-${version_id} + remote_file: ${project}/${version_id}/${revision}/mongodb${compile-variant|}-${version_id}.tar.gz bucket: mciuploads - local_file: src/mongod - - command: s3.get - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - remote_file: ${project}/${version_id}/${revision}/mongo-${version_id} - bucket: mciuploads - local_file: src/mongo + local_file: src/mongodb.tar.gz - command: shell.exec params: working_dir: src script: | set -e set -v - chmod +x mongod - chmod +x mongo + tar xvf mongodb.tar.gz - command: shell.exec params: background: true @@ -103,7 +95,7 @@ functions: set -e set -o verbose mkdir -p ./dbdata - ${mongod_exec_wrapper} ./mongod --dbpath ./dbdata ${mongod_flags} --logpath "${workdir}/mongod.log" + ${mongod_exec_wrapper} ./bin/mongod --dbpath ./dbdata ${mongod_flags} --logpath "${workdir}/mongod.log" - command: shell.exec params: working_dir: src @@ -119,7 +111,7 @@ functions: # As a result, writeConcernMajorityJournalDefault can be set to false. If this becomes configurable later # then the correct value should be passed to rs.initiate or getCmdLineOpts needs to interrogated (but # only after db.createUser). - ./mongo --eval "if(db.isMaster().isreplicaset){\ + ./bin/mongo --eval "if(db.isMaster().isreplicaset){\ rs.initiate({_id: 'test', version: 1, members: [ { _id: 0, host : 'localhost:27017' }], writeConcernMajorityJournalDefault:false});\ assert.soon(function(){return db.isMaster().ismaster}, 'no primary');\ }" @@ -127,12 +119,12 @@ functions: # benchRun() authenticates against the admin db, with a user that must has admin access. # Note: This is possibly a legacy requirement from times when it would call serverStatus. # Btw, when mongod is started without --auth, these should be harmless no-ops - ./mongo --eval "db.createUser({user: 'admin', pwd: 'password', roles:\ + ./bin/mongo --eval "db.createUser({user: 'admin', pwd: 'password', roles:\ [ { role: 'root', db: 'admin' } ] })"\ admin # print the replset config unless this is a standalone - ./mongo --eval "if( db.isMaster().hosts ) { printjson(rs.config()); }" --username admin --password password admin + ./bin/mongo --eval "if( db.isMaster().hosts ) { printjson(rs.config()); }" --username admin --password password admin echo "MONGOD STARTED." "analyze": - command: shell.exec @@ -255,9 +247,9 @@ functions: mkdir -p ../perf # give mongod a few seconds to start up so that we can connect. sleep 5 - ${perf_exec_wrapper} python benchrun.py --shell ../mongo -t ${threads} --trialCount 5 -f testcases/*.js --readCmd ${readCmd} --includeFilter ${includeFilter1} --includeFilter ${includeFilter2} --excludeFilter ${excludeFilter} --out ../perf/perf.json --exclude-testbed --username admin --password password + ${perf_exec_wrapper} python benchrun.py --shell ../bin/mongo -t ${threads} --trialCount 5 -f testcases/*.js --readCmd ${readCmd} --includeFilter ${includeFilter1} --includeFilter ${includeFilter2} --excludeFilter ${excludeFilter} --out ../perf/perf.json --exclude-testbed --username admin --password password echo "Oplog size at end of tests..." - ../mongo --username admin --password password --eval "db.getSiblingDB('local').oplog.rs.totalSize()/1024/1024" admin + ../bin/mongo --username admin --password password --eval "db.getSiblingDB('local').oplog.rs.totalSize()/1024/1024" admin - command: "json.send" params: name: "perf" @@ -337,27 +329,20 @@ tasks: set -o verbose source "${workdir}/compile_venv/bin/activate" - python ./buildscripts/scons.py ${compile_flags|} ${scons_cache_args|} mongo mongod + python ./buildscripts/scons.py ${compile_flags|} ${scons_cache_args|} --install-mode=hygienic install-mongo{,d} DESTDIR=$(pwd)/mongodb + tar czf mongodb${compile-variant|}.tar.gz -C mongodb . - command: s3.put params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/mongod - remote_file: ${project}/${version_id}/${revision}/mongod-${version_id} + local_file: src/mongodb${compile-variant|}.tar.gz + remote_file: ${project}/${version_id}/${revision}/mongodb${compile-variant|}-${version_id}.tar.gz bucket: mciuploads permissions: public-read - content_type: ${content_type|application/octet-stream} - display_name: mongod - - command: s3.put - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - local_file: src/build/cached/mongo/mongo - remote_file: ${project}/${version_id}/${revision}/mongo-${version_id} - bucket: mciuploads - permissions: public-read - content_type: ${content_type|application/octet-stream} - display_name: mongo + content_type: ${content_type|application/x-gzip} + display_name: mongodb${compile-variant|}.tar.gz + + - name: query depends_on: - variant: linux-wt-standalone |