Repository: tajo Updated Branches: refs/heads/master bf8731921 -> e44bca79d
TAJO-1736: Remove unnecessary getMountPath(). Closes #674 Signed-off-by: Jinho Kim <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/e44bca79 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/e44bca79 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/e44bca79 Branch: refs/heads/master Commit: e44bca79ddc4afdae6898f75f07bda0d3830db53 Parents: bf87319 Author: hys9958 <[email protected]> Authored: Mon Aug 3 15:47:15 2015 +0900 Committer: Jinho Kim <[email protected]> Committed: Mon Aug 3 15:47:15 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 ++ .../java/org/apache/tajo/master/TajoMaster.java | 40 ++------------- .../java/org/apache/tajo/worker/TajoWorker.java | 54 ++++---------------- 3 files changed, 17 insertions(+), 80 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/e44bca79/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 4859a52..25eec0f 100644 --- a/CHANGES +++ b/CHANGES @@ -33,6 +33,9 @@ Release 0.11.0 - unreleased IMPROVEMENT + TAJO-1736: Remove unnecessary getMountPath(). + (Contributed by YeonSu Han, Committed by jinho) + TAJO-1645: Bump up hbase to 1.1.1. (hyunsik) TAJO-1715: Precompute the hash value of various kinds of ids. (jihoon) http://git-wip-us.apache.org/repos/asf/tajo/blob/e44bca79/tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java b/tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java index 0a4ac2c..b70a79f 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java @@ -63,14 +63,14 @@ import org.apache.tajo.webapp.QueryExecutorServlet; import org.apache.tajo.webapp.StaticHttpServer; import org.apache.tajo.ws.rs.TajoRestService; -import java.io.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.Writer; import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; import java.lang.management.ThreadMXBean; import java.net.InetSocketAddress; -import java.util.ArrayList; import java.util.Collection; -import java.util.List; import java.util.Map; import static org.apache.tajo.TajoConstants.DEFAULT_DATABASE_NAME; @@ -526,40 +526,6 @@ public class TajoMaster extends CompositeService { } } - public static List<File> getMountPath() throws Exception { - BufferedReader mountOutput = null; - Process mountProcess = null; - try { - mountProcess = Runtime.getRuntime ().exec("mount"); - mountOutput = new BufferedReader(new InputStreamReader(mountProcess.getInputStream())); - List<File> mountPaths = new ArrayList<File>(); - while (true) { - String line = mountOutput.readLine(); - if (line == null) { - break; - } - - int indexStart = line.indexOf(" on /"); - int indexEnd = line.indexOf(" ", indexStart + 4); - - mountPaths.add(new File(line.substring (indexStart + 4, indexEnd))); - } - return mountPaths; - } catch (Exception e) { - e.printStackTrace(); - throw e; - } finally { - if(mountOutput != null) { - mountOutput.close(); - } - if (mountProcess != null) { - org.apache.commons.io.IOUtils.closeQuietly(mountProcess.getInputStream()); - org.apache.commons.io.IOUtils.closeQuietly(mountProcess.getOutputStream()); - org.apache.commons.io.IOUtils.closeQuietly(mountProcess.getErrorStream()); - } - } - } - private class ShutdownHook implements Runnable { @Override public void run() { http://git-wip-us.apache.org/repos/asf/tajo/blob/e44bca79/tajo-core/src/main/java/org/apache/tajo/worker/TajoWorker.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/worker/TajoWorker.java b/tajo-core/src/main/java/org/apache/tajo/worker/TajoWorker.java index 1119b59..811ba64 100644 --- a/tajo-core/src/main/java/org/apache/tajo/worker/TajoWorker.java +++ b/tajo-core/src/main/java/org/apache/tajo/worker/TajoWorker.java @@ -37,22 +37,22 @@ import org.apache.tajo.catalog.FunctionDesc; import org.apache.tajo.conf.TajoConf; import org.apache.tajo.engine.function.FunctionLoader; import org.apache.tajo.function.FunctionSignature; -import org.apache.tajo.metrics.Node; -import org.apache.tajo.rpc.RpcClientManager; -import org.apache.tajo.rpc.RpcConstants; -import org.apache.tajo.service.ServiceTracker; -import org.apache.tajo.service.ServiceTrackerFactory; -import org.apache.tajo.service.TajoMasterInfo; import org.apache.tajo.master.cluster.WorkerConnectionInfo; +import org.apache.tajo.metrics.Node; import org.apache.tajo.pullserver.TajoPullServerService; import org.apache.tajo.querymaster.QueryMaster; import org.apache.tajo.querymaster.QueryMasterManagerService; import org.apache.tajo.rpc.RpcChannelFactory; +import org.apache.tajo.rpc.RpcClientManager; +import org.apache.tajo.rpc.RpcConstants; import org.apache.tajo.rpc.protocolrecords.PrimitiveProtos; import org.apache.tajo.rule.EvaluationContext; import org.apache.tajo.rule.EvaluationFailedException; import org.apache.tajo.rule.SelfDiagnosisRuleEngine; import org.apache.tajo.rule.SelfDiagnosisRuleSession; +import org.apache.tajo.service.ServiceTracker; +import org.apache.tajo.service.ServiceTrackerFactory; +import org.apache.tajo.service.TajoMasterInfo; import org.apache.tajo.storage.HashShuffleAppenderManager; import org.apache.tajo.storage.OldStorageManager; import org.apache.tajo.util.*; @@ -61,13 +61,14 @@ import org.apache.tajo.util.history.HistoryWriter; import org.apache.tajo.util.metrics.TajoSystemMetrics; import org.apache.tajo.webapp.StaticHttpServer; -import java.io.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.Writer; import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; import java.lang.management.ThreadMXBean; import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import static org.apache.tajo.conf.TajoConf.ConfVars; @@ -282,7 +283,8 @@ public class TajoWorker extends CompositeService { } private void initCleanupService() throws IOException { - deletionService = new DeletionService(getMountPath().size(), 0); + String[] localDirs = systemConf.getVar(ConfVars.WORKER_TEMPORAL_DIR).trim().split("\\s*,\\s*"); + deletionService = new DeletionService(localDirs.length, 0); if (systemConf.getBoolVar(ConfVars.WORKER_TEMPORAL_DIR_CLEANUP)) { getWorkerContext().cleanupTemporalDirectories(); } @@ -612,40 +614,6 @@ public class TajoWorker extends CompositeService { } } - public static List<File> getMountPath() throws IOException { - BufferedReader mountOutput = null; - Process mountProcess = null; - try { - mountProcess = Runtime.getRuntime ().exec("mount"); - mountOutput = new BufferedReader(new InputStreamReader(mountProcess.getInputStream())); - List<File> mountPaths = new ArrayList<File>(); - while (true) { - String line = mountOutput.readLine(); - if (line == null) { - break; - } - - int indexStart = line.indexOf(" on /"); - int indexEnd = line.indexOf(" ", indexStart + 4); - - mountPaths.add(new File(line.substring (indexStart + 4, indexEnd))); - } - return mountPaths; - } catch (IOException e) { - e.printStackTrace(); - throw e; - } finally { - if(mountOutput != null) { - mountOutput.close(); - } - if (mountProcess != null) { - org.apache.commons.io.IOUtils.closeQuietly(mountProcess.getInputStream()); - org.apache.commons.io.IOUtils.closeQuietly(mountProcess.getOutputStream()); - org.apache.commons.io.IOUtils.closeQuietly(mountProcess.getErrorStream()); - } - } - } - public static void main(String[] args) throws Exception { Thread.setDefaultUncaughtExceptionHandler(new TajoUncaughtExceptionHandler()); StringUtils.startupShutdownMessage(TajoWorker.class, args, LOG);
