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

Un-AwaitsFix and enhance logging for testPolicyCRUD (#48719) 

* Un-AwaitsFix and enhance logging for testPolicyCRUD

This removes the `AwaitsFix` and increases the test logging for
`SnapshotLifecycleServiceTests.testPolicyCRUD` in an effort to track
down the cause of #44997.

* Remove unused import
This commit is contained in:
Lee Hinman 2019-10-30 16:11:27 -06:00 committed by Lee Hinman
parent ae1ef5fd92
commit 2d5291cf3b
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/scheduler/SchedulerEngine.java
View File

@ -71,6 +71,13 @@ public class SchedulerEngine {
public long getScheduledTime() { public long getScheduledTime() {
return scheduledTime; return scheduledTime;
} }
@Override
public String toString() {
return "Event[jobName=" + jobName + "," +
"triggeredTime=" + triggeredTime + "," +
"scheduledTime=" + scheduledTime + "]";
}
} }
public interface Listener { public interface Listener {

5
x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleServiceTests.java
View File

@ -16,6 +16,7 @@ import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.ClusterServiceUtils; import org.elasticsearch.test.ClusterServiceUtils;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.junit.annotations.TestIssueLogging;
import org.elasticsearch.threadpool.TestThreadPool; import org.elasticsearch.threadpool.TestThreadPool;
import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.xpack.core.ilm.OperationMode; import org.elasticsearch.xpack.core.ilm.OperationMode;
@ -148,7 +149,7 @@ public class SnapshotLifecycleServiceTests extends ESTestCase {
* Test new policies getting scheduled correctly, updated policies also being scheduled, * Test new policies getting scheduled correctly, updated policies also being scheduled,
* and deleted policies having their schedules cancelled. * and deleted policies having their schedules cancelled.
*/ */
@AwaitsFix( bugUrl = "https://github.com/elastic/elasticsearch/issues/44997") @TestIssueLogging(value = "org.elasticsearch.xpack.slm:TRACE", issueUrl = "https://github.com/elastic/elasticsearch/issues/44997")
public void testPolicyCRUD() throws Exception { public void testPolicyCRUD() throws Exception {
ClockMock clock = new ClockMock(); ClockMock clock = new ClockMock();
final AtomicInteger triggerCount = new AtomicInteger(0); final AtomicInteger triggerCount = new AtomicInteger(0);
@ -318,7 +319,7 @@ public class SnapshotLifecycleServiceTests extends ESTestCase {
@Override @Override
public void triggered(SchedulerEngine.Event event) { public void triggered(SchedulerEngine.Event event) {
logger.info("--> fake snapshot task triggered"); logger.info("--> fake snapshot task triggered: {}", event);
onTriggered.accept(event); onTriggered.accept(event);
} }
} }