Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-02-10 12:05:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

SOLR-12120: Harden AuditLoggerIntegrationTest, timing issues

Browse Source
This commit is contained in:
Jan Høydahl 2019-04-05 10:19:42 +02:00
parent 4d4688009a
commit aadc94a6e3
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
solr/core/src/test/org/apache/solr/security/AuditLoggerIntegrationTest.java
View File

@ -95,8 +95,8 @@ public class AuditLoggerIntegrationTest extends SolrCloudAuthTestCase {
public void testSynchronous() throws Exception { public void testSynchronous() throws Exception {
setupCluster(false, 0, false, null); setupCluster(false, 0, false, null);
runAdminCommands(); runAdminCommands();
waitForAuditEventCallbacks(3);
assertAuditMetricsMinimums(testHarness.get().cluster, CallbackAuditLoggerPlugin.class.getSimpleName(), 3, 0); assertAuditMetricsMinimums(testHarness.get().cluster, CallbackAuditLoggerPlugin.class.getSimpleName(), 3, 0);
testHarness.get().shutdownCluster();
assertThreeAdminEvents(); assertThreeAdminEvents();
} }
@ -104,20 +104,30 @@ public class AuditLoggerIntegrationTest extends SolrCloudAuthTestCase {
public void testAsync() throws Exception { public void testAsync() throws Exception {
setupCluster(true, 0, false, null); setupCluster(true, 0, false, null);
runAdminCommands(); runAdminCommands();
waitForAuditEventCallbacks(3);
assertAuditMetricsMinimums(testHarness.get().cluster, CallbackAuditLoggerPlugin.class.getSimpleName(), 3, 0); assertAuditMetricsMinimums(testHarness.get().cluster, CallbackAuditLoggerPlugin.class.getSimpleName(), 3, 0);
testHarness.get().shutdownCluster();
assertThreeAdminEvents(); assertThreeAdminEvents();
} }
@Test @Test
public void testAsyncWithQueue() throws Exception { public void testQueuedTimeMetric() throws Exception {
setupCluster(true, 100, false, null); setupCluster(true, 100, false, null);
runAdminCommands(); runAdminCommands();
waitForAuditEventCallbacks(3);
assertAuditMetricsMinimums(testHarness.get().cluster, CallbackAuditLoggerPlugin.class.getSimpleName(), 3, 0); assertAuditMetricsMinimums(testHarness.get().cluster, CallbackAuditLoggerPlugin.class.getSimpleName(), 3, 0);
ArrayList<MetricRegistry> registries = getMetricsReigstries(testHarness.get().cluster); ArrayList<MetricRegistry> registries = getMetricsReigstries(testHarness.get().cluster);
Timer timer = ((Timer) registries.get(0).getMetrics().get("SECURITY./auditlogging.CallbackAuditLoggerPlugin.queuedTime")); Timer timer = ((Timer) registries.get(0).getMetrics().get("SECURITY./auditlogging.CallbackAuditLoggerPlugin.queuedTime"));
double meanTimeOnQueue = timer.getSnapshot().getMean() / 1000000; // Convert to ms double meanTimeOnQueue = timer.getSnapshot().getMean() / 1000000; // Convert to ms
assertTrue(meanTimeOnQueue > 50); assertTrue("Expecting mean time on queue >10ms, got " + meanTimeOnQueue, meanTimeOnQueue > 10);
}
@Test
public void testAsyncQueueDrain() throws Exception {
setupCluster(true, 100, false, null);
runAdminCommands();
assertTrue("Expecting <2 callbacks in buffer, was " + testHarness.get().receiver.getBuffer().size(),
testHarness.get().receiver.getBuffer().size() < 2); // Events still on queue
// We shutdown cluster while events are still in queue
testHarness.get().shutdownCluster(); testHarness.get().shutdownCluster();
assertThreeAdminEvents(); assertThreeAdminEvents();
} }
@ -208,11 +218,15 @@ public class AuditLoggerIntegrationTest extends SolrCloudAuthTestCase {
} }
private void waitForAuditEventCallbacks(int number) throws InterruptedException { private void waitForAuditEventCallbacks(int number) throws InterruptedException {
waitForAuditEventCallbacks(number, 5);
}
private void waitForAuditEventCallbacks(int number, int timeoutSeconds) throws InterruptedException {
CallbackReceiver receiver = testHarness.get().receiver; CallbackReceiver receiver = testHarness.get().receiver;
int count = 0; int count = 0;
while(receiver.buffer.size() < number) { while(receiver.buffer.size() < number) {
Thread.sleep(100); Thread.sleep(100);
if (++count >= 30) fail("Failed waiting for " + number + " callbacks"); if (++count >= timeoutSeconds*10) fail("Failed waiting for " + number + " callbacks after " + timeoutSeconds + " seconds");
} }
} }

2
solr/core/src/test/org/apache/solr/security/CallbackAuditLoggerPlugin.java
View File

@ -70,7 +70,7 @@ public class CallbackAuditLoggerPlugin extends AuditLoggerPlugin {
@Override @Override
public void close() throws IOException { public void close() throws IOException {
if (socket != null) socket.close();
super.close(); super.close();
if (socket != null) socket.close();
} }
} }