Do not remove entries from local DB
The H2 based local DB serves as a backup storage when the main
events-log database is offline and it is emptied every time the former
is back online. This makes unnecessary to cleanup this local database.
Besides, if the local DB has never been necessary because the main one
has been online all the time, when trying to delete from the local one,
an error occurs complaining about non existent database.
Change-Id: Idf61bda5e9c5c791dae78166b5e8dd76ade8da19
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/EventsLogCleaner.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/EventsLogCleaner.java
index 6422944..e347341 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/EventsLogCleaner.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/EventsLogCleaner.java
@@ -23,16 +23,13 @@
@Singleton
public class EventsLogCleaner implements ProjectDeletedListener {
private final SQLClient eventsDb;
- private final SQLClient localEventsDb;
private ScheduledThreadPoolExecutor pool;
@Inject
EventsLogCleaner(
@EventsDb SQLClient eventsDb,
- @LocalEventsDb SQLClient localEventsDb,
@EventCleanerPool ScheduledThreadPoolExecutor pool) {
this.eventsDb = eventsDb;
- this.localEventsDb = localEventsDb;
this.pool = pool;
}
@@ -43,6 +40,5 @@
public void removeProjectEventsAsync(String projectName) {
pool.submit(() -> eventsDb.removeProjectEvents(projectName));
- pool.submit(() -> localEventsDb.removeProjectEvents(projectName));
}
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/EventsLogCleanerTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/EventsLogCleanerTest.java
index cd06855..09c21dc 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/EventsLogCleanerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/EventsLogCleanerTest.java
@@ -36,7 +36,6 @@
@Mock private EventsLogConfig cfgMock;
@Mock private EventsLogCleaner logCleanerMock;
@Mock private SQLClient eventsDb;
- @Mock private SQLClient localEventsDb;
@Mock private ProjectDeletedListener.Event event;
private ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(1);
@@ -45,7 +44,7 @@
@Before
public void setUp() throws Exception {
when(event.getProjectName()).thenReturn(PROJECT);
- eventsLogCleaner = new EventsLogCleaner(eventsDb, localEventsDb, executor);
+ eventsLogCleaner = new EventsLogCleaner(eventsDb, executor);
}
@Test
@@ -53,7 +52,6 @@
eventsLogCleaner.onProjectDeleted(event);
executor.awaitTermination(1, TimeUnit.SECONDS);
verify(eventsDb, times(1)).removeProjectEvents(PROJECT);
- verify(localEventsDb, times(1)).removeProjectEvents(PROJECT);
}
@After
