-
Notifications
You must be signed in to change notification settings - Fork 663
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add smarted scheduler to decide which tests to run on which shard.
- Loading branch information
Showing
5 changed files
with
122 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
#!/usr/bin/python | ||
import sys, string, json | ||
import requests | ||
|
||
BASE_URL="http://positive-cocoa-90213.appspot.com" | ||
|
||
def test_time(test_name, runtime): | ||
r = requests.post(BASE_URL + "/record/%s/%f" % (test_name, runtime)) | ||
print r.text | ||
assert r.status_code == 204 | ||
|
||
def test_sched(test_run, shard_count, shard_id): | ||
tests = json.dumps({'tests': string.split(sys.stdin.read())}) | ||
r = requests.post(BASE_URL + "/schedule/%d/%d/%d" % (test_run, shard_count, shard_id), data=tests) | ||
assert r.status_code == 200 | ||
result = r.json() | ||
for test in sorter(result['tests']): | ||
print test | ||
|
||
def usage(): | ||
print "%s <cmd> <args..>" % sys.argv[0] | ||
print " time <test name> <run time>" | ||
print " sched <test run> <num shards> <shard id>" | ||
|
||
def main(): | ||
if len(sys.argv) < 4: | ||
usage() | ||
sys.exit(1) | ||
|
||
if sys.argv[1] == "time": | ||
test_time(sys.argv[2], float(sys.argv[3])) | ||
elif sys.argv[1] == "sched": | ||
test_sched(int(sys.argv[2]), int(sys.argv[3]), int(sys.argv[4])) | ||
else: | ||
usage() | ||
|
||
if __name__ == '__main__': | ||
main() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
application: positive-cocoa-90213 | ||
version: 1 | ||
runtime: python27 | ||
api_version: 1 | ||
threadsafe: true | ||
|
||
handlers: | ||
- url: .* | ||
script: main.app | ||
|
||
libraries: | ||
- name: webapp2 | ||
version: latest | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
import operator | ||
|
||
import flask | ||
|
||
from google.appengine.ext import ndb | ||
|
||
app = flask.Flask('scheduler') | ||
app.debug = True | ||
|
||
class Test(ndb.Model): | ||
total_run_time = ndb.FloatProperty(default=0.) | ||
total_runs = ndb.IntegerProperty(default=0) | ||
|
||
class Schedule(ndb.Model): | ||
shards = ndb.JsonProperty() | ||
|
||
@app.route('/record/<test_name>/<runtime>', methods=['POST']) | ||
@ndb.transactional | ||
def record(test_name, runtime): | ||
test = Test.get_by_id(test_name) | ||
if test is None: | ||
test = Test(id=test_name) | ||
test.total_run_time += float(runtime) | ||
test.total_runs += 1 | ||
test.put() | ||
return ('', 204) | ||
|
||
@app.route('/schedule/<int:test_run>/<int:shard_count>/<int:shard>', methods=['POST']) | ||
def schedule(test_run, shard_count, shard): | ||
# read tests from body | ||
test_names = flask.request.get_json(force=True)['tests'] | ||
|
||
# first see if we have a scedule already | ||
schedule_id = "%d-%d" % (test_run, shard_count) | ||
schedule = Schedule.get_by_id(schedule_id) | ||
if schedule is not None: | ||
return flask.json.jsonify(tests=schedule.shards[str(shard)]) | ||
|
||
# if not, do simple greedy algorithm | ||
test_times = ndb.get_multi(ndb.Key(Test, test_name) for test_name in test_names) | ||
def avg(test): | ||
if test is not None: | ||
return test.total_run_time / test.total_runs | ||
return 1 | ||
test_times = [(test_name, avg(test)) for test_name, test in zip(test_names, test_times)] | ||
test_times_dict = dict(test_times) | ||
test_times.sort(key=operator.itemgetter(1)) | ||
|
||
shards = {i: [] for i in xrange(shard_count)} | ||
while test_times: | ||
test_name, time = test_times.pop() | ||
|
||
# find shortest shard and put it in that | ||
s, _ = min(((i, sum(test_times_dict[t] for t in shards[i])) | ||
for i in xrange(shard_count)), key=operator.itemgetter(1)) | ||
|
||
shards[s].append(test_name) | ||
|
||
# atomically insert or retrieve existing schedule | ||
schedule = Schedule.get_or_insert(schedule_id, shards=shards) | ||
return flask.json.jsonify(tests=schedule.shards[str(shard)]) |