diff --git a/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/hbase/TestPigHBaseStorageHandler.java b/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/hbase/TestPigHBaseStorageHandler.java index e0d5299e22..fe33f47793 100644 --- a/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/hbase/TestPigHBaseStorageHandler.java +++ b/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/hbase/TestPigHBaseStorageHandler.java @@ -55,7 +55,6 @@ import org.apache.pig.data.Tuple; import org.apache.pig.impl.logicalLayer.schema.Schema; import org.apache.pig.impl.logicalLayer.schema.Schema.FieldSchema; -import org.junit.Ignore; import org.junit.Test; public class TestPigHBaseStorageHandler extends SkeletonHBaseTest { @@ -140,7 +139,6 @@ public static void createTestDataFile(String filename) throws IOException { } - @Ignore("See HIVE-23762") @Test public void testPigHBaseSchema() throws Exception { Initialize(); @@ -203,8 +201,6 @@ public void testPigHBaseSchema() throws Exception { } - - @Ignore("See HIVE-23762") @Test public void testPigFilterProjection() throws Exception { Initialize(); @@ -283,7 +279,6 @@ public void testPigFilterProjection() throws Exception { assertEquals(index-1,4); } - @Ignore("See HIVE-23762") @Test public void testPigPopulation() throws Exception { Initialize(); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/repl/metric/MetricSink.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/repl/metric/MetricSink.java index 07f2916d67..ca4758dc90 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/repl/metric/MetricSink.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/repl/metric/MetricSink.java @@ -121,6 +121,7 @@ public void run() { ObjectMapper mapper = new ObjectMapper(); persistentMetric.setProgress(mapper.writeValueAsString(metric.getProgress())); persistentMetric.setMetadata(mapper.writeValueAsString(metric.getMetadata())); + LOG.debug("Metric to be persisted {} ", persistentMetric); replicationMetricsList.add(persistentMetric); } metricList.setReplicationMetricList(replicationMetricsList); diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ReplicationMetricsMaintTask.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ReplicationMetricsMaintTask.java index 1df99e09ae..ba83aa4a9b 100644 --- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ReplicationMetricsMaintTask.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ReplicationMetricsMaintTask.java @@ -44,7 +44,7 @@ public long initialDelay(TimeUnit unit) { @Override public long runFrequency(TimeUnit unit) { return MetastoreConf.getTimeVar(conf, ConfVars.REPL_METRICS_CLEANUP_FREQUENCY, - TimeUnit.DAYS); + unit); } @Override @@ -63,13 +63,12 @@ public void run() { if (!MetastoreConf.getBoolVar(conf, ConfVars.SCHEDULED_QUERIES_ENABLED)) { return; } - LOG.debug("Cleaning up older Metrics"); RawStore ms = HiveMetaStore.HMSHandler.getMSForConf(conf); - int maxRetainSecs = (int) TimeUnit.DAYS.toSeconds(MetastoreConf.getTimeVar(conf, - ConfVars.REPL_METRICS_MAX_AGE, TimeUnit.DAYS)); + int maxRetainSecs = (int) MetastoreConf.getTimeVar(conf, ConfVars.REPL_METRICS_MAX_AGE, TimeUnit.SECONDS); + LOG.info("Cleaning up Metrics older than {} ", maxRetainSecs); int deleteCnt = ms.deleteReplicationMetrics(maxRetainSecs); if (deleteCnt > 0L){ - LOG.info("Number of deleted entries: " + deleteCnt); + LOG.info("Number of deleted entries: {} " + deleteCnt); } } catch (Exception e) { LOG.error("Exception while trying to delete: " + e.getMessage(), e);