aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject [39/50] [abbrv] git commit: Merge branch 'master' into mansu/aurora-281_job_page
Date Sat, 05 Apr 2014 00:05:25 GMT
Merge branch 'master' into mansu/aurora-281_job_page

Conflicts:
	src/main/resources/org/apache/aurora/scheduler/http/ui/js/services.js


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/11dd1628
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/11dd1628
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/11dd1628

Branch: refs/heads/mansu/job_page
Commit: 11dd16287d66f8d53c568c5b70f5de761e2fa137
Parents: 037fc51 9906d21
Author: Suman Karumuri <skarumuri@twitter.com>
Authored: Wed Apr 2 15:42:31 2014 -0700
Committer: Suman Karumuri <skarumuri@twitter.com>
Committed: Wed Apr 2 15:42:31 2014 -0700

----------------------------------------------------------------------
 3rdparty/javascript/thrift.js                   |  25 +-
 BUILD                                           |  15 +
 LICENSE                                         | 111 ++++-
 NOTICE                                          |  49 +-
 build-support/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 50514 bytes
 .../gradle/wrapper/gradle-wrapper.properties    |   6 +
 build-support/release/make-python-sdists        |  16 +
 build-support/tools/list-missing-shipits        |  99 ++--
 build-support/virtualenv                        |  15 +
 build.gradle                                    |  90 ++--
 examples/scheduler/scheduler-local.sh           |  16 +
 examples/vagrant/provision-aurora-scheduler.sh  |  16 +
 examples/vagrant/provision-dev-environment.sh   |  17 +
 examples/vagrant/provision-mesos-master.sh      |  16 +
 examples/vagrant/provision-mesos-slave.sh       |  16 +
 examples/vagrant/provision-zookeeper.sh         |  18 +-
 gradle/wrapper/gradle-wrapper.jar               | Bin 50514 -> 0 bytes
 gradle/wrapper/gradle-wrapper.properties        |   6 -
 gradlew                                         |  17 +-
 .../aurora/scheduler/async/AsyncModule.java     |  19 +-
 .../aurora/scheduler/async/HistoryPruner.java   |  55 ++-
 .../aurora/scheduler/cron/CrontabEntry.java     | 480 +++++++++++++++++++
 .../aurora/scheduler/cron/CrontabEntryTest.java | 163 +++++++
 .../aurora/scheduler/http/StructDump.java       |   5 +-
 .../aurora/scheduler/state/CronJobManager.java  | 127 +++--
 .../scheduler/state/ImmediateJobManager.java    |  61 ---
 .../aurora/scheduler/state/JobManager.java      |  85 ----
 .../aurora/scheduler/state/SchedulerCore.java   |   9 -
 .../scheduler/state/SchedulerCoreImpl.java      |  82 +---
 .../scheduler/state/StateManagerImpl.java       |   2 +-
 .../aurora/scheduler/state/StateModule.java     |   2 -
 .../scheduler/state/TaskStateMachine.java       | 146 +++---
 .../thrift/SchedulerThriftInterface.java        |  11 +-
 .../aurora/scheduler/thrift/ThriftModule.java   |   4 +
 src/main/python/apache/aurora/client/BUILD      |   2 +-
 .../aurora/client/api/scheduler_client.py       |   8 +
 src/main/python/apache/aurora/client/api/sla.py |  35 +-
 .../apache/aurora/client/bin/aurora_admin.py    |   4 +-
 .../python/apache/aurora/client/cli/__init__.py |  59 ++-
 .../python/apache/aurora/client/cli/bridge.py   |  15 +
 .../python/apache/aurora/client/cli/client.py   |  15 +
 .../python/apache/aurora/client/cli/context.py  |  20 +-
 .../python/apache/aurora/client/cli/jobs.py     | 157 ++++--
 .../python/apache/aurora/client/cli/options.py  |  58 ++-
 .../python/apache/aurora/client/cli/quota.py    |  12 +-
 src/main/python/apache/aurora/client/cli/sla.py |   4 +-
 .../python/apache/aurora/client/cli/task.py     |   1 -
 .../apache/aurora/client/commands/admin.py      |   2 +-
 .../apache/aurora/client/commands/core.py       |  55 ++-
 src/main/python/apache/aurora/client/config.py  |  35 ++
 .../apache/aurora/client/hooks/hooked_api.py    |   4 +-
 src/main/python/apache/aurora/client/options.py |   8 +
 src/main/python/apache/aurora/common/BUILD      |   3 +
 .../python/apache/aurora/config/__init__.py     |  12 +-
 src/main/python/apache/aurora/config/thrift.py  |  12 +-
 src/main/python/apache/thermos/README.md        |   6 +-
 src/main/python/apache/thermos/core/BUILD       |   1 +
 .../aurora/scheduler/http/ui/js/services.js     |   2 +-
 .../root/checkpoints/failure/coordinator.p1     | Bin 162 -> 0 bytes
 .../root/checkpoints/failure/coordinator.p2     | Bin 324 -> 0 bytes
 .../root/checkpoints/failure/coordinator.p3     | Bin 486 -> 0 bytes
 .../thermos/root/checkpoints/failure/runner     | Bin 1383 -> 0 bytes
 .../checkpoints/failure_limit/coordinator.a     | Bin 159 -> 0 bytes
 .../checkpoints/failure_limit/coordinator.b     | Bin 159 -> 0 bytes
 .../root/checkpoints/failure_limit/runner       | Bin 589 -> 0 bytes
 .../checkpoints/hello_world/coordinator.echo    | Bin 168 -> 0 bytes
 .../thermos/root/checkpoints/hello_world/runner | Bin 405 -> 0 bytes
 .../checkpoints/ordering/coordinator.echo_one   | Bin 180 -> 0 bytes
 .../checkpoints/ordering/coordinator.echo_three | Bin 186 -> 0 bytes
 .../checkpoints/ordering/coordinator.echo_two   | Bin 180 -> 0 bytes
 .../thermos/root/checkpoints/ordering/runner    | Bin 870 -> 0 bytes
 .../root/checkpoints/ports/coordinator.echo     | Bin 168 -> 0 bytes
 .../thermos/root/checkpoints/ports/runner       | Bin 433 -> 0 bytes
 .../checkpoints/sleep60-lost/coordinator.sleep  | Bin 114 -> 0 bytes
 .../root/checkpoints/sleep60-lost/runner        | Bin 352 -> 0 bytes
 .../root/checkpoints/sleep60/coordinator.sleep  | Bin 114 -> 0 bytes
 .../thermos/root/checkpoints/sleep60/runner     | Bin 446 -> 0 bytes
 .../thermos/root/logs/failure/p1/0/stderr       |   0
 .../thermos/root/logs/failure/p1/0/stdout       |   2 -
 .../thermos/root/logs/failure/p2/0/stderr       |   0
 .../thermos/root/logs/failure/p2/0/stdout       |   2 -
 .../thermos/root/logs/failure/p2/1/stderr       |   0
 .../thermos/root/logs/failure/p2/1/stdout       |   2 -
 .../thermos/root/logs/failure/p3/0/stderr       |   0
 .../thermos/root/logs/failure/p3/0/stdout       |   2 -
 .../thermos/root/logs/failure/p3/1/stderr       |   0
 .../thermos/root/logs/failure/p3/1/stdout       |   2 -
 .../thermos/root/logs/failure/p3/2/stderr       |   0
 .../thermos/root/logs/failure/p3/2/stdout       |   2 -
 .../thermos/root/logs/failure_limit/a/0/stderr  |   0
 .../thermos/root/logs/failure_limit/a/0/stdout  |   1 -
 .../thermos/root/logs/failure_limit/b/0/stderr  |   0
 .../thermos/root/logs/failure_limit/b/0/stdout  |   0
 .../thermos/root/logs/hello_world/echo/0/stderr |   0
 .../thermos/root/logs/hello_world/echo/0/stdout |   1 -
 .../root/logs/ordering/echo_one/0/stderr        |   0
 .../root/logs/ordering/echo_one/0/stdout        |   1 -
 .../root/logs/ordering/echo_three/0/stderr      |   0
 .../root/logs/ordering/echo_three/0/stdout      |   1 -
 .../root/logs/ordering/echo_two/0/stderr        |   0
 .../root/logs/ordering/echo_two/0/stdout        |   1 -
 .../thermos/root/logs/ports/echo/0/stderr       |   0
 .../thermos/root/logs/ports/echo/0/stdout       |   1 -
 .../root/logs/sleep60-lost/sleep/0/stderr       |   0
 .../root/logs/sleep60-lost/sleep/0/stdout       |   0
 .../thermos/root/logs/sleep60/sleep/0/stderr    |   0
 .../thermos/root/logs/sleep60/sleep/0/stdout    |   0
 .../org/apache/thermos/root/sandbox/p1          |   1 -
 .../org/apache/thermos/root/sandbox/p2          |   2 -
 .../org/apache/thermos/root/sandbox/p3          |   3 -
 .../thermos/root/tasks/active/sleep60-lost      |   1 -
 .../apache/thermos/root/tasks/finished/failure  |   1 -
 .../thermos/root/tasks/finished/failure_limit   |   1 -
 .../thermos/root/tasks/finished/hello_world     |   1 -
 .../apache/thermos/root/tasks/finished/ordering |   1 -
 .../apache/thermos/root/tasks/finished/ports    |   1 -
 .../apache/thermos/root/tasks/finished/sleep60  |   1 -
 .../scheduler/async/HistoryPrunerTest.java      |  30 +-
 .../state/BaseSchedulerCoreImplTest.java        |  32 +-
 .../scheduler/state/CronJobManagerTest.java     |  46 +-
 .../scheduler/state/TaskStateMachineTest.java   |   8 +-
 .../thrift/SchedulerThriftInterfaceTest.java    |   5 +-
 .../python/apache/aurora/client/api/test_sla.py |  89 +++-
 .../apache/aurora/client/api/test_updater.py    |   8 +-
 src/test/python/apache/aurora/client/cli/BUILD  |  13 +
 .../apache/aurora/client/cli/test_bridge.py     |  15 +
 .../aurora/client/cli/test_cancel_update.py     |   4 +-
 .../apache/aurora/client/cli/test_create.py     |   8 +-
 .../apache/aurora/client/cli/test_diff.py       |   2 +-
 .../apache/aurora/client/cli/test_kill.py       | 134 +++++-
 .../apache/aurora/client/cli/test_logging.py    | 134 ++++++
 .../apache/aurora/client/cli/test_plugins.py    |   2 +-
 .../apache/aurora/client/cli/test_quota.py      |  90 ++--
 .../apache/aurora/client/cli/test_restart.py    |  39 +-
 .../python/apache/aurora/client/cli/test_sla.py |  10 +-
 .../apache/aurora/client/cli/test_status.py     |  22 +-
 .../apache/aurora/client/cli/test_task_run.py   |   4 +-
 .../apache/aurora/client/cli/test_update.py     |  15 +
 .../python/apache/aurora/client/cli/util.py     |  30 ++
 .../python/apache/aurora/client/commands/BUILD  |  12 +
 .../aurora/client/commands/test_admin_sla.py    |  11 +-
 .../client/commands/test_cancel_update.py       |   1 +
 .../aurora/client/commands/test_create.py       |   1 +
 .../apache/aurora/client/commands/test_diff.py  |   3 +-
 .../apache/aurora/client/commands/test_hooks.py | 247 ++++++++++
 .../apache/aurora/client/commands/test_kill.py  |   1 +
 .../aurora/client/commands/test_listjobs.py     |   1 +
 .../aurora/client/commands/test_maintenance.py  |   1 +
 .../aurora/client/commands/test_restart.py      |   1 +
 .../apache/aurora/client/commands/test_run.py   |   3 +-
 .../apache/aurora/client/commands/test_ssh.py   |   3 +-
 .../aurora/client/commands/test_status.py       |  17 +-
 .../aurora/client/commands/test_update.py       |   1 +
 .../python/apache/aurora/client/hooks/BUILD     |   2 +
 .../python/apache/aurora/config/test_thrift.py  |  15 +-
 src/test/sh/org/apache/aurora/e2e/flask/BUILD   |  15 +
 .../apache/aurora/e2e/flask/flask_example.py    |  15 +
 .../sh/org/apache/aurora/e2e/test_common.sh     |  17 +
 .../sh/org/apache/aurora/e2e/test_end_to_end.sh |  18 +
 159 files changed, 2592 insertions(+), 893 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/11dd1628/build.gradle
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/11dd1628/src/main/resources/org/apache/aurora/scheduler/http/ui/js/services.js
----------------------------------------------------------------------
diff --cc src/main/resources/org/apache/aurora/scheduler/http/ui/js/services.js
index 3a71302,8681bbe..8310171
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/services.js
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/services.js
@@@ -2,80 -2,38 +2,80 @@@
  
  auroraUI.factory(
    'auroraClient',
 -  function () {
 -    return {
 -      getRoleSummary: function () {
 -        var response = this.getSchedulerClient().getRoleSummary();
 -        return {
 -          error: response.responseCode !== 1,
 -          errorMsg: response.message,
 -          summaries: response.result !== null ? response.result.roleSummaryResult.summaries
: [],
 -          pageTitle: this.getPageTitle(response.serverInfo)
 -        }
 -      },
 -
 -      // TODO(Suman Karumuri): Make schedulerClient a service
 -      schedulerClient: null,
 -
 -      getSchedulerClient: function () {
 -        if (!this.schedulerClient) {
 -          var transport = new Thrift.Transport("/api");
 -          var protocol = new Thrift.Protocol(transport);
 -          this.schedulerClient = new ReadOnlySchedulerClient(protocol);
 -          return this.schedulerClient;
 -        } else {
 -          return this.schedulerClient;
 -        }
 -      },
 -
 -      getPageTitle: function (info) {
 -        var title = "Aurora UI";
 -        return info.error || typeof info.clusterName === "undefined"
 -                 ? title
 -                 : info.clusterName + " " + title;
 -      }
 -    };
 -  }
 -);
 +  ['$window',
 +    function ($window) {
 +      return {
 +        getRoleSummary: function () {
 +          var response = this.getSchedulerClient().getRoleSummary();
 +          var result = this.processResponse(response);
 +          result.summaries = response.result !== null
 +            ? response.result.roleSummaryResult.summaries : [];
 +          return result;
 +        },
 +
 +        getJobSummary: function (role) {
 +          var response = this.getSchedulerClient().getJobSummary(role);
 +          var result = this.processResponse(response);
 +          result.jobs = response.result !== null ? response.result.jobSummaryResult.summaries
: [];
 +          return result;
 +        },
 +
 +        getQuota: function (role) {
 +          var response = this.getSchedulerClient().getQuota(role);
 +          var result = this.processResponse(response);
 +          result.quota = response.result !== null ? response.result.getQuotaResult : [];
 +          return result;
 +        },
 +
 +        getTasks: function (role, environment, jobName) {
 +          var id = new Identity();
 +          id.role = role;
 +          var taskQuery = new TaskQuery();
 +          taskQuery.identity = id;
 +          taskQuery.environment = environment;
 +          taskQuery.jobName = jobName;
 +          var response = this.getSchedulerClient().getTasksStatus(taskQuery);
 +          var result = this.processResponse(response);
 +          result.tasks = response.result !== null ? response.result.scheduleStatusResult.tasks
: [];
 +          return result;
 +        },
 +
 +        // TODO(Suman Karumuri): Make schedulerClient a service
 +        schedulerClient: null,
 +
 +        getSchedulerClient: function () {
 +          if (!this.schedulerClient) {
 +            var transport = new Thrift.Transport("/api/");
 +            var protocol = new Thrift.Protocol(transport);
 +            this.schedulerClient = new ReadOnlySchedulerClient(protocol);
 +            return this.schedulerClient;
 +          } else {
 +            return this.schedulerClient;
 +          }
 +        },
 +
 +        processResponse: function (response) {
 +          this.setPageTitle(response.serverInfo);
 +          return {
 +            error: response.responseCode !== 1
 +              ? (response.message || 'No error message returned by the scheduler')
 +              : '',
 +            statsURLPrefix: response.serverInfo && response.serverInfo.statsURLPrefix
 +              ? response.serverInfo.statsURLPrefix
 +              : ''
 +          };
 +        },
 +
 +        getPageTitle: function (info) {
 +          var title = "Aurora UI";
 +          return _.isNull(info) || info.error || typeof info.clusterName === "undefined"
 +            ? title
 +            : info.clusterName + " " + title;
 +        },
 +
 +        setPageTitle: function (serverInfo) {
 +          $window.document.title = this.getPageTitle(serverInfo);
-         }
++       }
 +      };
 +    }
 +  ]);

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/11dd1628/src/test/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterfaceTest.java
----------------------------------------------------------------------


Mime
View raw message