This is an automated email from the ASF dual-hosted git repository.
eyang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4cb559e YARN-9027. Fixed LevelDBCacheTimelineStore initialization.
Contributed by Prabhu Joseph
4cb559e is described below
commit 4cb559ea7bcf00fc4a574fffad9a3f73b8c532b0
Author: Eric Yang <[email protected]>
AuthorDate: Fri May 31 14:31:44 2019 -0400
YARN-9027. Fixed LevelDBCacheTimelineStore initialization.
Contributed by Prabhu Joseph
---
.../yarn/server/timeline/LevelDBCacheTimelineStore.java | 8 ++++++++
.../yarn/server/timeline/TestLevelDBCacheTimelineStore.java | 13 +++++++++++++
2 files changed, 21 insertions(+)
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java
index 9b1ffdc..f84eeeb 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java
@@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* LevelDB implementation of {@link KeyValueBasedTimelineStore}. This
@@ -63,6 +64,8 @@ public class LevelDBCacheTimelineStore extends
KeyValueBasedTimelineStore {
private String dbId;
private DB entityDb;
private Configuration configuration;
+ private static final AtomicInteger DB_COUNTER = new AtomicInteger(0);
+ private static final String CACHED_LDB_FILENAME = "db";
public LevelDBCacheTimelineStore(String id, String name) {
super(name);
@@ -76,6 +79,11 @@ public class LevelDBCacheTimelineStore extends
KeyValueBasedTimelineStore {
this(id, LevelDBCacheTimelineStore.class.getName());
}
+ public LevelDBCacheTimelineStore() {
+ this(CACHED_LDB_FILENAME + String.valueOf(DB_COUNTER.getAndIncrement()),
+ LevelDBCacheTimelineStore.class.getName());
+ }
+
@Override
protected synchronized void serviceInit(Configuration conf) throws Exception
{
configuration = conf;
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestLevelDBCacheTimelineStore.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestLevelDBCacheTimelineStore.java
index 66da1e0..43b04a5 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestLevelDBCacheTimelineStore.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestLevelDBCacheTimelineStore.java
@@ -19,9 +19,11 @@
package org.apache.hadoop.yarn.server.timeline;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.hadoop.util.ReflectionUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
import java.io.IOException;
@@ -47,6 +49,17 @@ public class TestLevelDBCacheTimelineStore extends
TimelineStoreTestUtils {
}
@Test
+ public void testDefaultConstructor() {
+ TimelineStore store = null;
+ try {
+ store = ReflectionUtils.newInstance(LevelDBCacheTimelineStore.class,
+ new YarnConfiguration());
+ } finally {
+ assertNotNull("LevelDBCacheTimelineStore failed to instantiate", store);
+ }
+ }
+
+ @Test
public void testGetSingleEntity() throws IOException {
super.testGetSingleEntity();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
