Repository: kylin Updated Branches: refs/heads/fix-sonar-1 c8d95251b -> 676689400 (forced update)
fix InterruptedException Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/67668940 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/67668940 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/67668940 Branch: refs/heads/fix-sonar-1 Commit: 676689400b3589b97c3c06d993665a3369373d86 Parents: b32435c Author: Billy Liu <billy...@apache.org> Authored: Fri Dec 30 19:20:21 2016 +0800 Committer: Billy Liu <billy...@apache.org> Committed: Fri Dec 30 19:20:21 2016 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/common/util/MemoryBudgetController.java | 4 +++- .../org/apache/kylin/cube/inmemcubing/DoggedCubeBuilder.java | 3 +++ .../org/apache/kylin/cube/inmemcubing/InMemCubeBuilder.java | 2 ++ .../java/org/apache/kylin/cube/inmemcubing/MemDiskStore.java | 1 + .../org/apache/kylin/engine/mr/common/HadoopStatusGetter.java | 2 ++ .../org/apache/kylin/engine/mr/common/MapReduceExecutable.java | 3 ++- .../apache/kylin/engine/mr/steps/MapContextGTRecordWriter.java | 1 + .../apache/kylin/engine/spark/cube/BufferedCuboidWriter.java | 3 +++ .../java/org/apache/kylin/rest/service/BadQueryDetector.java | 5 +++-- .../kylin/storage/hbase/cube/v2/ExpectedSizeIterator.java | 2 ++ .../apache/kylin/storage/hbase/util/HbaseStreamingInput.java | 2 ++ .../java/org/apache/kylin/storage/hbase/util/PingHBaseCLI.java | 1 + tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java | 1 + 13 files changed, 26 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/67668940/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java b/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java index 920f8e6..ade929c 100644 --- a/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java +++ b/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java @@ -58,7 +58,7 @@ public class MemoryBudgetController { public static final MemoryBudgetController ZERO_BUDGET = new MemoryBudgetController(0); public static final int ONE_MB = 1024 * 1024; - public static final long ONE_GB = 1024 * 1024 * 1024; + public static final long ONE_GB = 1024 * 1024 * 1024L; private static final Logger logger = LoggerFactory.getLogger(MemoryBudgetController.class); @@ -119,6 +119,7 @@ public class MemoryBudgetController { try { lock.wait(); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); throw new NotEnoughBudgetException(e); } } @@ -256,6 +257,7 @@ public class MemoryBudgetController { lastMB = thisMB; } } catch (InterruptedException e) { + Thread.currentThread().interrupt(); logger.error("", e); return getSystemAvailMB(); } http://git-wip-us.apache.org/repos/asf/kylin/blob/67668940/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/DoggedCubeBuilder.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/DoggedCubeBuilder.java b/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/DoggedCubeBuilder.java index 413c448..a9211da 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/DoggedCubeBuilder.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/DoggedCubeBuilder.java @@ -180,6 +180,7 @@ public class DoggedCubeBuilder extends AbstractInMemCubeBuilder { try { split.join(); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); errors.add(e); } if (split.exception != null) @@ -221,6 +222,7 @@ public class DoggedCubeBuilder extends AbstractInMemCubeBuilder { return false; } catch (InterruptedException e) { + Thread.currentThread().interrupt(); throw new RuntimeException(e); } } @@ -239,6 +241,7 @@ public class DoggedCubeBuilder extends AbstractInMemCubeBuilder { last.join(); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); throw new RuntimeException(e); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/67668940/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/InMemCubeBuilder.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/InMemCubeBuilder.java b/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/InMemCubeBuilder.java index 66a444e..85a694f 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/InMemCubeBuilder.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/InMemCubeBuilder.java @@ -205,6 +205,7 @@ public class InMemCubeBuilder extends AbstractInMemCubeBuilder { for (Thread t : threads) t.join(); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); throw new IOException("interrupted while waiting task and output complete", e); } } @@ -531,6 +532,7 @@ public class InMemCubeBuilder extends AbstractInMemCubeBuilder { try { currentObject = input.take(); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); throw new RuntimeException(e); } return currentObject != null && currentObject.size() > 0; http://git-wip-us.apache.org/repos/asf/kylin/blob/67668940/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/MemDiskStore.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/MemDiskStore.java b/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/MemDiskStore.java index 3cfaed7..81403ab 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/MemDiskStore.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/MemDiskStore.java @@ -603,6 +603,7 @@ public class MemDiskStore implements IGTStore, Closeable { } catch (NullPointerException npe) { // that's fine, async flusher may not present } catch (InterruptedException e) { + Thread.currentThread().interrupt(); logger.warn("async join interrupted", e); } synchronized (lock) { http://git-wip-us.apache.org/repos/asf/kylin/blob/67668940/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/HadoopStatusGetter.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/HadoopStatusGetter.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/HadoopStatusGetter.java index 7dcb73e..1107aa5 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/HadoopStatusGetter.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/HadoopStatusGetter.java @@ -150,6 +150,7 @@ public class HadoopStatusGetter { logger.debug("Job " + mrJobId + " check redirect url " + url + ".\n"); } } catch (InterruptedException e) { + Thread.currentThread().interrupt(); logger.error(e.getMessage()); } finally { httpget.releaseConnection(); @@ -212,6 +213,7 @@ public class HadoopStatusGetter { logger.debug("Job " + mrJobId + " check redirect url " + url + ".\n"); } } catch (InterruptedException e) { + Thread.currentThread().interrupt(); logger.error(e.getMessage()); } finally { get.releaseConnection(); http://git-wip-us.apache.org/repos/asf/kylin/blob/67668940/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/MapReduceExecutable.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/MapReduceExecutable.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/MapReduceExecutable.java index a26d4ff..be11e39 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/MapReduceExecutable.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/MapReduceExecutable.java @@ -84,6 +84,7 @@ public class MapReduceExecutable extends AbstractExecutable { logger.warn("error get hadoop status"); super.onExecuteStart(executableContext); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); logger.warn("error get hadoop status"); super.onExecuteStart(executableContext); } @@ -171,7 +172,7 @@ public class MapReduceExecutable extends AbstractExecutable { return new ExecuteResult(ExecuteResult.State.FAILED, output.toString()); } } - Thread.sleep(context.getConfig().getYarnStatusCheckIntervalSeconds() * 1000); + Thread.sleep(context.getConfig().getYarnStatusCheckIntervalSeconds() * 1000L); } // try to kill running map-reduce job to release resources. http://git-wip-us.apache.org/repos/asf/kylin/blob/67668940/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MapContextGTRecordWriter.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MapContextGTRecordWriter.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MapContextGTRecordWriter.java index aedf541..d183f90 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MapContextGTRecordWriter.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MapContextGTRecordWriter.java @@ -41,6 +41,7 @@ public class MapContextGTRecordWriter extends KVGTRecordWriter { try { mapContext.write(key, value); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); throw new IOException(e); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/67668940/engine-spark/src/main/java/org/apache/kylin/engine/spark/cube/BufferedCuboidWriter.java ---------------------------------------------------------------------- diff --git a/engine-spark/src/main/java/org/apache/kylin/engine/spark/cube/BufferedCuboidWriter.java b/engine-spark/src/main/java/org/apache/kylin/engine/spark/cube/BufferedCuboidWriter.java index 8cc0792..b3334b7 100644 --- a/engine-spark/src/main/java/org/apache/kylin/engine/spark/cube/BufferedCuboidWriter.java +++ b/engine-spark/src/main/java/org/apache/kylin/engine/spark/cube/BufferedCuboidWriter.java @@ -44,6 +44,7 @@ public class BufferedCuboidWriter implements SparkCuboidWriter { try { blockingQueue.put(tupleConverter.convert(cuboidId, record)); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); throw new RuntimeException(e); } } @@ -57,6 +58,7 @@ public class BufferedCuboidWriter implements SparkCuboidWriter { try { blockingQueue.put(new Tuple2(new byte[0], new byte[0])); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); throw new RuntimeException(e); } } @@ -75,6 +77,7 @@ public class BufferedCuboidWriter implements SparkCuboidWriter { try { current = blockingQueue.take(); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); throw new RuntimeException(e); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/67668940/server-base/src/main/java/org/apache/kylin/rest/service/BadQueryDetector.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/BadQueryDetector.java b/server-base/src/main/java/org/apache/kylin/rest/service/BadQueryDetector.java index 2b85e69..64f91b1 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/service/BadQueryDetector.java +++ b/server-base/src/main/java/org/apache/kylin/rest/service/BadQueryDetector.java @@ -52,7 +52,7 @@ public class BadQueryDetector extends Thread { super("BadQueryDetector"); this.setDaemon(true); this.kylinConfig = KylinConfig.getInstanceFromEnv(); - this.detectionInterval = kylinConfig.getBadQueryDefaultDetectIntervalSeconds() * 1000; + this.detectionInterval = kylinConfig.getBadQueryDefaultDetectIntervalSeconds() * 1000L; this.alertMB = 100; this.alertRunningSec = kylinConfig.getBadQueryDefaultAlertingSeconds(); @@ -118,6 +118,7 @@ public class BadQueryDetector extends Thread { try { Thread.sleep(detectionInterval); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); // stop detection and exit return; } @@ -208,7 +209,7 @@ public class BadQueryDetector extends Thread { @Override public void badQueryFound(String adj, float runningSec, long startTime, String project, String sql, String user, Thread t) { try { - long cachingSeconds = (kylinConfig.getBadQueryDefaultAlertingSeconds() + 1) * 30; + long cachingSeconds = (kylinConfig.getBadQueryDefaultAlertingSeconds() + 1) * 30L; Pair<Long, String> sqlPair = new Pair<>(startTime, sql); if (!cacheQueue.contains(sqlPair)) { badQueryManager.addEntryToProject(sql, startTime, adj, runningSec, serverHostname, t.getName(), user, project); http://git-wip-us.apache.org/repos/asf/kylin/blob/67668940/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/ExpectedSizeIterator.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/ExpectedSizeIterator.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/ExpectedSizeIterator.java index 2d574bd..59fe9e0 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/ExpectedSizeIterator.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/ExpectedSizeIterator.java @@ -74,6 +74,7 @@ class ExpectedSizeIterator implements Iterator<byte[]> { return ret; } catch (InterruptedException e) { + Thread.currentThread().interrupt(); throw new RuntimeException("Error when waiting queue", e); } } @@ -87,6 +88,7 @@ class ExpectedSizeIterator implements Iterator<byte[]> { try { queue.put(data); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); throw new RuntimeException("error when waiting queue", e); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/67668940/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/HbaseStreamingInput.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/HbaseStreamingInput.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/HbaseStreamingInput.java index e26c8e8..1db60fb 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/HbaseStreamingInput.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/HbaseStreamingInput.java @@ -116,6 +116,7 @@ public class HbaseStreamingInput { logger.warn("There are another " + waiting + " batches waiting to be added"); } } catch (InterruptedException e) { + Thread.currentThread().interrupt(); e.printStackTrace(); } @@ -166,6 +167,7 @@ public class HbaseStreamingInput { logger.warn("Too many queries to handle! Blocking " + waiting + " sets of scan requests"); } } catch (InterruptedException e) { + Thread.currentThread().interrupt(); e.printStackTrace(); } http://git-wip-us.apache.org/repos/asf/kylin/blob/67668940/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/PingHBaseCLI.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/PingHBaseCLI.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/PingHBaseCLI.java index e219c5a..1ea8e8d 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/PingHBaseCLI.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/PingHBaseCLI.java @@ -51,6 +51,7 @@ public class PingHBaseCLI { System.out.println("--------------Getting kerberos credential for user " + UserGroupInformation.getCurrentUser().getUserName()); TokenUtil.obtainAndCacheToken(hconf, UserGroupInformation.getCurrentUser()); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); System.out.println("--------------Error while getting kerberos credential for user " + UserGroupInformation.getCurrentUser().getUserName()); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/67668940/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java ---------------------------------------------------------------------- diff --git a/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java b/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java index 94fccf8..e1f994f 100644 --- a/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java +++ b/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java @@ -231,6 +231,7 @@ public class DiagnosisInfoCLI extends AbstractInfoExtractor { try { executorService.awaitTermination(Long.MAX_VALUE, TimeUnit.MINUTES); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); throw new RuntimeException("Diagnosis info dump interrupted.", e); } }
