You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2013/11/24 08:06:04 UTC
git commit: TAJO-296: Late registration of Tajo workers.
(hyoungjunkim via hyunsik)
Updated Branches:
refs/heads/master 0c1262aed -> b37453d00
TAJO-296: Late registration of Tajo workers. (hyoungjunkim via hyunsik)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/b37453d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/b37453d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/b37453d0
Branch: refs/heads/master
Commit: b37453d004f0be10864e1d1188f28a768f5141ca
Parents: 0c1262a
Author: Hyunsik Choi <hy...@apache.org>
Authored: Sun Nov 24 16:05:27 2013 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Sun Nov 24 16:05:27 2013 +0900
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../src/main/java/org/apache/tajo/webapp/HttpServer.java | 11 ++++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/b37453d0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ebecf47..2550019 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -41,6 +41,8 @@ Release 0.8.0 - unreleased
BUG FIXES
+ TAJO-296: Late registration of Tajo workers. (hyoungjunkim via hyunsik)
+
TAJO-321: Invalid split file of compressed text file. (jinho)
TAJO-295: ConcurrentModificationException in TaskScheduler. (jinho)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/b37453d0/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/webapp/HttpServer.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/webapp/HttpServer.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/webapp/HttpServer.java
index 3164bd0..60faef2 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/webapp/HttpServer.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/webapp/HttpServer.java
@@ -25,6 +25,7 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Handler;
import org.mortbay.jetty.Server;
+import org.mortbay.jetty.SessionIdManager;
import org.mortbay.jetty.handler.ContextHandlerCollection;
import org.mortbay.jetty.nio.SelectChannelConnector;
import org.mortbay.jetty.servlet.*;
@@ -38,10 +39,7 @@ import java.io.IOException;
import java.io.InterruptedIOException;
import java.net.BindException;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* This class is borrowed from Hadoop and is simplified to our objective.
@@ -72,13 +70,16 @@ public class HttpServer {
listener = createBaseListener(conf);
listener.setHost(bindAddress);
listener.setPort(port);
+
} else {
listenerStartedExternally = true;
listener = connector;
}
-
webServer.addConnector(listener);
+ SessionIdManager sessionIdManager = new HashSessionIdManager(new Random(System.currentTimeMillis()));
+ webServer.setSessionIdManager(sessionIdManager);
+
int maxThreads = conf.getInt("tajo.http.maxthreads", -1);
// If HTTP_MAX_THREADS is not configured, QueueThreadPool() will use the
// default value (currently 250).