You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2013/11/25 11:02:31 UTC
git commit: TAJO-314: Make TaskScheduler be pluggable. (fixed missing
changes in the configuration)
Updated Branches:
refs/heads/master 92674542d -> 67e0d94c4
TAJO-314: Make TaskScheduler be pluggable. (fixed missing changes in the configuration)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/67e0d94c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/67e0d94c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/67e0d94c
Branch: refs/heads/master
Commit: 67e0d94c4828b014b3b83a6713b172b482b63a6a
Parents: 9267454
Author: Jihoon Son <ji...@apache.org>
Authored: Mon Nov 25 19:00:02 2013 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Mon Nov 25 19:01:08 2013 +0900
----------------------------------------------------------------------
.../main/java/org/apache/tajo/master/TaskSchedulerFactory.java | 4 ++--
.../org/apache/tajo/master/event/TaskAttemptAssignedEvent.java | 1 -
.../apache/tajo/master/event/TaskAttemptStatusUpdateEvent.java | 1 -
.../java/org/apache/tajo/master/event/TaskCompletionEvent.java | 1 -
.../java/org/apache/tajo/master/event/TaskFatalErrorEvent.java | 1 -
.../tajo-core-backend/src/main/resources/tajo-default.xml | 6 +++---
6 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/67e0d94c/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TaskSchedulerFactory.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TaskSchedulerFactory.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TaskSchedulerFactory.java
index 57132db..72de4ec 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TaskSchedulerFactory.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TaskSchedulerFactory.java
@@ -57,7 +57,7 @@ public class TaskSchedulerFactory {
String handlerName = getSchedulerType(conf);
Class<? extends AbstractTaskScheduler> schedulerClass = CACHED_SCHEDULER_CLASSES.get(handlerName);
if (schedulerClass == null) {
- schedulerClass = conf.getClass(String.format("tajo.master.scheduler-handler.%s.class", handlerName), null, AbstractTaskScheduler.class);
+ schedulerClass = conf.getClass(String.format("tajo.querymaster.scheduler-handler.%s.class", handlerName), null, AbstractTaskScheduler.class);
CACHED_SCHEDULER_CLASSES.put(handlerName, schedulerClass);
}
@@ -69,6 +69,6 @@ public class TaskSchedulerFactory {
}
public static String getSchedulerType(Configuration conf) {
- return conf.get("tajo.master.scheduler.type", "default");
+ return conf.get("tajo.querymaster.scheduler-handler.type", "default");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/67e0d94c/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskAttemptAssignedEvent.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskAttemptAssignedEvent.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskAttemptAssignedEvent.java
index ec4a682..4934633 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskAttemptAssignedEvent.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskAttemptAssignedEvent.java
@@ -18,7 +18,6 @@
package org.apache.tajo.master.event;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.tajo.QueryUnitAttemptId;
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/67e0d94c/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskAttemptStatusUpdateEvent.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskAttemptStatusUpdateEvent.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskAttemptStatusUpdateEvent.java
index aad77c8..d980e05 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskAttemptStatusUpdateEvent.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskAttemptStatusUpdateEvent.java
@@ -18,7 +18,6 @@
package org.apache.tajo.master.event;
-import org.apache.hadoop.conf.Configuration;
import org.apache.tajo.QueryUnitAttemptId;
import org.apache.tajo.ipc.TajoWorkerProtocol.TaskStatusProto;
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/67e0d94c/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskCompletionEvent.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskCompletionEvent.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskCompletionEvent.java
index f3e2ab2..3ee389a 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskCompletionEvent.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskCompletionEvent.java
@@ -18,7 +18,6 @@
package org.apache.tajo.master.event;
-import org.apache.hadoop.conf.Configuration;
import org.apache.tajo.QueryUnitAttemptId;
import org.apache.tajo.ipc.TajoWorkerProtocol.TaskCompletionReport;
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/67e0d94c/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskFatalErrorEvent.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskFatalErrorEvent.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskFatalErrorEvent.java
index b54aab9..d70de8a 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskFatalErrorEvent.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/event/TaskFatalErrorEvent.java
@@ -18,7 +18,6 @@
package org.apache.tajo.master.event;
-import org.apache.hadoop.conf.Configuration;
import org.apache.tajo.QueryUnitAttemptId;
import org.apache.tajo.ipc.TajoWorkerProtocol.TaskFatalErrorReport;
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/67e0d94c/tajo-core/tajo-core-backend/src/main/resources/tajo-default.xml
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/resources/tajo-default.xml b/tajo-core/tajo-core-backend/src/main/resources/tajo-default.xml
index fd30fc3..2fd04ba 100644
--- a/tajo-core/tajo-core-backend/src/main/resources/tajo-default.xml
+++ b/tajo-core/tajo-core-backend/src/main/resources/tajo-default.xml
@@ -39,19 +39,19 @@
<!--- Registered Scheduler Handler -->
<property>
- <name>tajo.master.scheduler-handler</name>
+ <name>tajo.querymaster.scheduler-handler</name>
<value>default</value>
</property>
<!--- Scheduler Configuration -->
<property>
- <name>tajo.master.scheduler.type</name>
+ <name>tajo.querymaster.scheduler-handler.type</name>
<value>default</value>
</property>
<!--- Scheduler Handler -->
<property>
- <name>tajo.master.scheduler-handler.default.class</name>
+ <name>tajo.querymaster.scheduler-handler.default.class</name>
<value>org.apache.tajo.master.DefaultTaskScheduler</value>
</property>