Repository: tajo Updated Branches: refs/heads/master 5d5b15200 -> c45d0ef02
TAJO-1297: Tajo Web UI does not work after TAJO-1291. (jihoon) Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/c45d0ef0 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/c45d0ef0 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/c45d0ef0 Branch: refs/heads/master Commit: c45d0ef02df1aa59bb54e0da0205890cc050fcff Parents: 5d5b152 Author: Jihoon Son <[email protected]> Authored: Sat Jan 10 17:04:44 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Sat Jan 10 17:04:44 2015 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ tajo-core/src/main/resources/webapps/admin/index.jsp | 4 ++-- .../src/main/resources/webapps/worker/querytasks.jsp | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/c45d0ef0/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 646bd11..5f427a9 100644 --- a/CHANGES +++ b/CHANGES @@ -161,6 +161,8 @@ Release 0.9.1 - unreleased BUG FIXES + TAJO-1297: Tajo Web UI does not work after TAJO-1291. (jihoon) + TAJO-1251: Query is hanging occasionally by shuffle report. (jinho) TAJO-1287: Repeated using of the same order by key in multiple http://git-wip-us.apache.org/repos/asf/tajo/blob/c45d0ef0/tajo-core/src/main/resources/webapps/admin/index.jsp ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/resources/webapps/admin/index.jsp b/tajo-core/src/main/resources/webapps/admin/index.jsp index 0defb3c..d98abfd 100644 --- a/tajo-core/src/main/resources/webapps/admin/index.jsp +++ b/tajo-core/src/main/resources/webapps/admin/index.jsp @@ -21,7 +21,7 @@ <%@ page import="org.apache.hadoop.fs.FileSystem" %> <%@ page import="org.apache.tajo.conf.TajoConf" %> -<%@ page import="org.apache.tajo.ipc.TajoMasterProtocol" %> +<%@ page import="org.apache.tajo.ipc.QueryCoordinatorProtocol" %> <%@ page import="org.apache.tajo.master.TajoMaster" %> <%@ page import="org.apache.tajo.ha.HAService" %> <%@ page import="org.apache.tajo.ha.TajoMasterInfo" %> @@ -52,7 +52,7 @@ int runningQueryMasterTask = 0; - TajoMasterProtocol.ClusterResourceSummary clusterResourceSummary = + QueryCoordinatorProtocol.ClusterResourceSummary clusterResourceSummary = master.getContext().getResourceManager().getClusterResourceSummary(); for(Worker eachWorker: workers.values()) { http://git-wip-us.apache.org/repos/asf/tajo/blob/c45d0ef0/tajo-core/src/main/resources/webapps/worker/querytasks.jsp ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/resources/webapps/worker/querytasks.jsp b/tajo-core/src/main/resources/webapps/worker/querytasks.jsp index 6d0e3a2..3e3c2c2 100644 --- a/tajo-core/src/main/resources/webapps/worker/querytasks.jsp +++ b/tajo-core/src/main/resources/webapps/worker/querytasks.jsp @@ -24,7 +24,7 @@ <%@ page import="org.apache.tajo.TaskAttemptId" %> <%@ page import="org.apache.tajo.catalog.statistics.TableStats" %> <%@ page import="org.apache.tajo.plan.util.PlannerUtil" %> -<%@ page import="org.apache.tajo.ipc.TajoMasterProtocol" %> +<%@ page import="org.apache.tajo.ipc.QueryCoordinatorProtocol" %> <%@ page import="org.apache.tajo.querymaster.*" %> <%@ page import="org.apache.tajo.webapp.StaticHttpServer" %> <%@ page import="org.apache.tajo.worker.TajoWorker" %> @@ -60,12 +60,12 @@ } TajoWorker tajoWorker = (TajoWorker) StaticHttpServer.getInstance().getAttribute("tajo.info.server.object"); - List<TajoMasterProtocol.WorkerResourceProto> allWorkers = tajoWorker.getWorkerContext() + List<QueryCoordinatorProtocol.WorkerResourceProto> allWorkers = tajoWorker.getWorkerContext() .getQueryMasterManagerService().getQueryMaster().getAllWorker(); - Map<Integer, TajoMasterProtocol.WorkerResourceProto> workerMap = new HashMap<Integer, TajoMasterProtocol.WorkerResourceProto>(); + Map<Integer, QueryCoordinatorProtocol.WorkerResourceProto> workerMap = new HashMap<Integer, QueryCoordinatorProtocol.WorkerResourceProto>(); if(allWorkers != null) { - for(TajoMasterProtocol.WorkerResourceProto eachWorker: allWorkers) { + for(QueryCoordinatorProtocol.WorkerResourceProto eachWorker: allWorkers) { workerMap.put(eachWorker.getConnectionInfo().getId(), eachWorker); } } @@ -230,7 +230,7 @@ String taskHost = eachTask.getSucceededHost() == null ? "-" : eachTask.getSucceededHost(); if(eachTask.getSucceededHost() != null) { - TajoMasterProtocol.WorkerResourceProto worker = + QueryCoordinatorProtocol.WorkerResourceProto worker = workerMap.get(eachTask.getLastAttempt().getWorkerConnectionInfo().getId()); if(worker != null) { TaskAttempt lastAttempt = eachTask.getLastAttempt();
