Repository: kylin Updated Branches: refs/heads/fix-sonar [created] 3d8f1a505
http://git-wip-us.apache.org/repos/asf/kylin/blob/3d8f1a50/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/common/coprocessor/AggregationCache.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/common/coprocessor/AggregationCache.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/common/coprocessor/AggregationCache.java index 06cdbba..2a85894 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/common/coprocessor/AggregationCache.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/common/coprocessor/AggregationCache.java @@ -29,7 +29,7 @@ import com.google.common.collect.Maps; */ @SuppressWarnings("rawtypes") public abstract class AggregationCache { - static final long MEMORY_USAGE_CAP = 500 * 1024 * 1024; // 500 MB + static final long MEMORY_USAGE_CAP = 500 * 1024 * 1024L; // 500 MB static final long MEMOERY_MAX_BYTES = Runtime.getRuntime().maxMemory(); protected final Map<AggrKey, MeasureAggregator[]> aggBufMap; transient int rowMemBytes; @@ -75,7 +75,7 @@ public abstract class AggregationCache { } } int size = aggBufMap.size(); - long memUsage = (40 + rowMemBytes) * size; + long memUsage = (40L + rowMemBytes) * size; if (memUsage > MEMORY_USAGE_CAP) { throw new RuntimeException("Kylin coprocessor memory usage goes beyond cap, (40 + " + rowMemBytes + ") * " + size + " > " + MEMORY_USAGE_CAP + ". Abort coprocessor."); } http://git-wip-us.apache.org/repos/asf/kylin/blob/3d8f1a50/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/3d8f1a50/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/3d8f1a50/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/3d8f1a50/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedJobLock.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedJobLock.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedJobLock.java index 613d783..5a44cc1 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedJobLock.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedJobLock.java @@ -141,6 +141,8 @@ public class ZookeeperDistributedJobLock implements DistributedJobLock { } catch (Exception e) { logger.error("fail to get the serverName for the path: " + lockPath, e); } + if(lockServerName == null) + return false; return lockServerName.equalsIgnoreCase(serverName); } http://git-wip-us.apache.org/repos/asf/kylin/blob/3d8f1a50/tool/src/main/java/org/apache/kylin/tool/CubeMetaIngester.java ---------------------------------------------------------------------- diff --git a/tool/src/main/java/org/apache/kylin/tool/CubeMetaIngester.java b/tool/src/main/java/org/apache/kylin/tool/CubeMetaIngester.java index 40cbf32..b4c44c3 100644 --- a/tool/src/main/java/org/apache/kylin/tool/CubeMetaIngester.java +++ b/tool/src/main/java/org/apache/kylin/tool/CubeMetaIngester.java @@ -20,6 +20,7 @@ package org.apache.kylin.tool; import java.io.File; import java.io.IOException; +import java.util.Arrays; import java.util.Set; import org.apache.commons.cli.Option; @@ -126,7 +127,7 @@ public class CubeMetaIngester extends AbstractApplication { tempFolder.mkdir(); ZipFileUtils.decompressZipfileToDirectory(srcPath, tempFolder); if (tempFolder.list().length != 1) { - throw new IllegalStateException(tempFolder.list().toString()); + throw new IllegalStateException(Arrays.toString(tempFolder.list())); } injest(tempFolder.listFiles()[0].getAbsoluteFile()); http://git-wip-us.apache.org/repos/asf/kylin/blob/3d8f1a50/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); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/3d8f1a50/tool/src/main/java/org/apache/kylin/tool/HBaseUsageExtractor.java ---------------------------------------------------------------------- diff --git a/tool/src/main/java/org/apache/kylin/tool/HBaseUsageExtractor.java b/tool/src/main/java/org/apache/kylin/tool/HBaseUsageExtractor.java index f993155..0d8c08f 100644 --- a/tool/src/main/java/org/apache/kylin/tool/HBaseUsageExtractor.java +++ b/tool/src/main/java/org/apache/kylin/tool/HBaseUsageExtractor.java @@ -51,7 +51,7 @@ import com.google.common.collect.Lists; public class HBaseUsageExtractor extends AbstractInfoExtractor { - private static final Logger logger = LoggerFactory.getLogger(CubeMetaExtractor.class); + private static final Logger logger = LoggerFactory.getLogger(HBaseUsageExtractor.class); @SuppressWarnings("static-access") private static final Option OPTION_CUBE = OptionBuilder.withArgName("cube").hasArg().isRequired(false).withDescription("Specify which cube to extract").create("cube"); @SuppressWarnings("static-access") http://git-wip-us.apache.org/repos/asf/kylin/blob/3d8f1a50/tool/src/main/java/org/apache/kylin/tool/StorageCleanupJob.java ---------------------------------------------------------------------- diff --git a/tool/src/main/java/org/apache/kylin/tool/StorageCleanupJob.java b/tool/src/main/java/org/apache/kylin/tool/StorageCleanupJob.java index 05e0142..5b993fb 100644 --- a/tool/src/main/java/org/apache/kylin/tool/StorageCleanupJob.java +++ b/tool/src/main/java/org/apache/kylin/tool/StorageCleanupJob.java @@ -243,6 +243,7 @@ public class StorageCleanupJob extends AbstractApplication { } System.out.println("-------------------------------------------------------"); } + fs.close(); } private void cleanUnusedIntermediateHiveTable(Configuration conf) throws Exception { @@ -349,6 +350,7 @@ public class StorageCleanupJob extends AbstractApplication { } else { logger.info("Hive table {}'s external path {} not exist. It's normal if kylin.source.hive.keep-flat-table set false (By default)", tableToDelete, path); } + fs.close(); } else { logger.warn("Hive table {}'s job ID not found, segmentId2JobId: {}", tableToDelete, segmentId2JobId.toString()); }
