honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Give audit logs more time to show up in SQL tests 

CI has been failing since we had to remove our tweaks to the audit
logging configuration due to
https://github.com/elastic/x-pack-elasticsearch/issues/2705

So we increase the timeout. The timeout is very very long, but it
seems like we need it for CI which is often slow.

Original commit: elastic/x-pack-elasticsearch@91a926a031
This commit is contained in:
Nik Everett 2017-10-12 13:53:09 -04:00
parent 69a326dd94
commit 69d1a5c5dd
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qa/sql/security/build.gradle
View File

@ -13,6 +13,7 @@ integTestCluster {
// Try and speed up audit logging without overwelming it // Try and speed up audit logging without overwelming it
setting 'xpack.security.audit.index.flush_interval', '250ms' setting 'xpack.security.audit.index.flush_interval', '250ms'
// NOCOMMIT reenable after https://github.com/elastic/x-pack-elasticsearch/issues/2705 for lower overhead tests // NOCOMMIT reenable after https://github.com/elastic/x-pack-elasticsearch/issues/2705 for lower overhead tests
// see the NOCOMMIT in RestSqlSecurityIT#cleanAuditLogs and revert to 1 minute once this is reenabled
// setting 'xpack.security.audit.index.settings.index.number_of_shards', '1' // setting 'xpack.security.audit.index.settings.index.number_of_shards', '1'
// setting 'xpack.security.audit.index.settings.index.refresh_interval', '250ms' // setting 'xpack.security.audit.index.settings.index.refresh_interval', '250ms'
// Setup roles used by tests // Setup roles used by tests

3
qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/RestSqlSecurityIT.java
View File

@ -114,7 +114,8 @@ public class RestSqlSecurityIT extends ESRestTestCase {
logger.info("Waiting on bulk writes to finish:\n{}", bulksString); logger.info("Waiting on bulk writes to finish:\n{}", bulksString);
fail("Waiting on bulk writes to finish:\n" + bulksString); fail("Waiting on bulk writes to finish:\n" + bulksString);
} }
}, 1, TimeUnit.MINUTES); }, 4, TimeUnit.MINUTES);
// NOCOMMIT 1 minute used to be plenty before we
try { try {
clearAuditEvents(); clearAuditEvents();
} catch (ResponseException e) { } catch (ResponseException e) {