Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add legacy REST endpoints to integration tests #17

Merged
merged 3 commits into from
May 24, 2021
Merged

Add legacy REST endpoints to integration tests #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
886a3c7
Add legacy REST endpoints to integration tests
jotok May 24, 2021
ee7d079
Fix legacy test name
jotok May 24, 2021
d069847
Change LEGACY constant name to include OPENDISTRO
jotok May 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 27 additions & 6 deletions src/test/java/org/opensearch/performanceanalyzer/ConfigOverridesIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,24 @@ public class ConfigOverridesIT extends PerformanceAnalyzerIntegTestBase {
private static final String CONFIG_OVERRIDES_ENDPOINT =
RestConfig.PA_BASE_URI + "/override/cluster/config";

private static final String LEGACY_OPENDISTRO_CONFIG_OVERRIDES_ENDPOINT =
RestConfig.LEGACY_PA_BASE_URI + "/override/cluster/config";

private static final List<String> EMPTY_LIST = Collections.emptyList();
public static final String HOT_SHARD_RCA = "HotShardRca";
public static final String HOT_NODE_CLUSTER_RCA = "HotNodeClusterRca";

@Test
public void testSimpleOverride() throws Exception {
testSimpleOverride(CONFIG_OVERRIDES_ENDPOINT);
}

@Test
public void testLegacySimpleOverride() throws Exception {
testSimpleOverride(LEGACY_OPENDISTRO_CONFIG_OVERRIDES_ENDPOINT);
}

public void testSimpleOverride(String configOverridesEndpoint) throws Exception {
ensurePaAndRcaEnabled();
final ConfigOverrides overrides =
getOverrides(
Expand All @@ -64,7 +76,7 @@ public void testSimpleOverride() throws Exception {
EMPTY_LIST,
EMPTY_LIST,
EMPTY_LIST);
final Request postRequest = new Request(METHOD_POST, CONFIG_OVERRIDES_ENDPOINT);
final Request postRequest = new Request(METHOD_POST, configOverridesEndpoint);
postRequest.setJsonEntity(mapper.writeValueAsString(overrides));

try {
Expand All @@ -78,7 +90,7 @@ public void testSimpleOverride() throws Exception {
WaitFor.waitFor(
() -> {
try {
Map<String, Object> responseEntity = getAsMap(CONFIG_OVERRIDES_ENDPOINT);
Map<String, Object> responseEntity = getAsMap(configOverridesEndpoint);
String serializedOverrides = (String) responseEntity.get("overrides");
final ConfigOverrides computedOverrides =
mapper.readValue(serializedOverrides, ConfigOverrides.class);
Expand All @@ -94,6 +106,15 @@ public void testSimpleOverride() throws Exception {

@Test
public void testCompositeOverrides() throws Exception {
testCompositeOverrides(CONFIG_OVERRIDES_ENDPOINT);
}

@Test
public void testLegacyCompositeOverrides() throws Exception {
testCompositeOverrides(LEGACY_OPENDISTRO_CONFIG_OVERRIDES_ENDPOINT);
}

public void testCompositeOverrides(String configOverridesEndpoint) throws Exception {
ensurePaAndRcaEnabled();

final ConfigOverrides initialOverrides =
Expand All @@ -105,7 +126,7 @@ public void testCompositeOverrides() throws Exception {
EMPTY_LIST,
EMPTY_LIST);

final Request postRequest = new Request(METHOD_POST, CONFIG_OVERRIDES_ENDPOINT);
final Request postRequest = new Request(METHOD_POST, configOverridesEndpoint);
postRequest.setJsonEntity(mapper.writeValueAsString(initialOverrides));

try {
Expand All @@ -118,7 +139,7 @@ public void testCompositeOverrides() throws Exception {

WaitFor.waitFor(
() -> {
final Request getRequest = new Request(METHOD_GET, CONFIG_OVERRIDES_ENDPOINT);
final Request getRequest = new Request(METHOD_GET, configOverridesEndpoint);
try {
final Response response = client().performRequest(getRequest);
assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode());
Expand Down Expand Up @@ -148,7 +169,7 @@ public void testCompositeOverrides() throws Exception {
EMPTY_LIST,
EMPTY_LIST);

final Request postRequestAdjusted = new Request(METHOD_POST, CONFIG_OVERRIDES_ENDPOINT);
final Request postRequestAdjusted = new Request(METHOD_POST, configOverridesEndpoint);
postRequestAdjusted.setJsonEntity(mapper.writeValueAsString(adjustedOverrides));

try {
Expand All @@ -170,7 +191,7 @@ public void testCompositeOverrides() throws Exception {

WaitFor.waitFor(
() -> {
final Request getRequest = new Request(METHOD_GET, CONFIG_OVERRIDES_ENDPOINT);
final Request getRequest = new Request(METHOD_GET, configOverridesEndpoint);
try {
final Response response = client().performRequest(getRequest);
assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode());
Expand Down
22 changes: 20 additions & 2 deletions src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerRCAHealthCheckIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,23 @@
public class PerformanceAnalyzerRCAHealthCheckIT extends PerformanceAnalyzerIntegTestBase {
@Test
public void checkMetrics() throws Exception {
checkMetrics(RestConfig.PA_BASE_URI);
}

@Test
public void checkLegacyMetrics() throws Exception {
checkMetrics(RestConfig.LEGACY_PA_BASE_URI);
}

public void checkMetrics(String paBaseUri) throws Exception {
ensurePaAndRcaEnabled();
final String[] jsonString = new String[1];
WaitFor.waitFor(
() -> {
Request request =
new Request(
"GET",
RestConfig.PA_BASE_URI
paBaseUri
+ "/metrics/?metrics=Disk_Utilization&agg=max&dim=&nodes=all");
Response resp = paClient.performRequest(request);
Assert.assertEquals(HttpStatus.SC_OK, resp.getStatusLine().getStatusCode());
Expand Down Expand Up @@ -86,10 +95,19 @@ public void checkMetrics() throws Exception {

@Test
public void testRcaIsRunning() throws Exception {
testRcaIsRunning(RestConfig.PA_BASE_URI);
}

@Test
public void testLegacyRcaIsRunning() throws Exception {
testRcaIsRunning(RestConfig.LEGACY_PA_BASE_URI);
}

public void testRcaIsRunning(String paBaseUri) throws Exception {
ensurePaAndRcaEnabled();
WaitFor.waitFor(
() -> {
Request request = new Request("GET", RestConfig.PA_BASE_URI + "/rca");
Request request = new Request("GET", paBaseUri + "/rca");
try {
Response resp = paClient.performRequest(request);
return Objects.equals(
Expand Down
15 changes: 11 additions & 4 deletions src/test/java/org/opensearch/performanceanalyzer/integ_test/CpuMetricsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,24 @@ public void init() throws Exception {

@Test
public void checkCPUUtilization() throws Exception {
checkCPUUtilization(RestConfig.PA_BASE_URI);
}

@Test
public void checkLegacyCPUUtilization() throws Exception {
checkCPUUtilization(RestConfig.LEGACY_PA_BASE_URI);
}

public void checkCPUUtilization(String paBaseUri) throws Exception {
// read metric from local node
List<JsonResponseNode> responseNodeList =
readMetric(RestConfig.PA_BASE_URI + "/metrics/?metrics=CPU_Utilization&agg=sum");
readMetric(paBaseUri + "/metrics/?metrics=CPU_Utilization&agg=sum");
Assert.assertEquals(1, responseNodeList.size());
validatePerNodeCPUMetric(responseNodeList.get(0));

// read metric from all nodes in cluster
responseNodeList =
readMetric(
RestConfig.PA_BASE_URI
+ "/metrics/?metrics=CPU_Utilization&agg=sum&nodes=all");
readMetric(paBaseUri + "/metrics/?metrics=CPU_Utilization&agg=sum&nodes=all");
int nodeNum = getNodeIDs().size();
Assert.assertEquals(nodeNum, responseNodeList.size());
for (int i = 0; i < nodeNum; i++) {
Expand Down
47 changes: 37 additions & 10 deletions src/test/java/org/opensearch/performanceanalyzer/integ_test/HeapMetricsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,37 +59,64 @@ public void init() throws Exception {
@Test
public void checkHeapInit() throws Exception {
checkHeapMetric(
AllMetrics.HeapValue.HEAP_INIT, (d) -> d >= MIN_HEAP_IN_MB && d <= MAX_HEAP_IN_MB);
AllMetrics.HeapValue.HEAP_INIT,
(d) -> d >= MIN_HEAP_IN_MB && d <= MAX_HEAP_IN_MB,
RestConfig.PA_BASE_URI);
}

@Test
public void checkLegacyHeapInit() throws Exception {
checkHeapMetric(
AllMetrics.HeapValue.HEAP_INIT,
(d) -> d >= MIN_HEAP_IN_MB && d <= MAX_HEAP_IN_MB,
RestConfig.LEGACY_PA_BASE_URI);
}

@Test
public void checkHeapMax() throws Exception {
checkHeapMetric(
AllMetrics.HeapValue.HEAP_MAX, (d) -> d >= MIN_HEAP_IN_MB && d <= MAX_HEAP_IN_MB);
AllMetrics.HeapValue.HEAP_MAX,
(d) -> d >= MIN_HEAP_IN_MB && d <= MAX_HEAP_IN_MB,
RestConfig.PA_BASE_URI);
}

@Test
public void checkLegacyHeapMax() throws Exception {
checkHeapMetric(
AllMetrics.HeapValue.HEAP_MAX,
(d) -> d >= MIN_HEAP_IN_MB && d <= MAX_HEAP_IN_MB,
RestConfig.LEGACY_PA_BASE_URI);
}

@Test
public void checkHeapUsed() throws Exception {
checkHeapMetric(
AllMetrics.HeapValue.HEAP_USED, (d) -> d >= MIN_HEAP_IN_MB && d <= MAX_HEAP_IN_MB);
AllMetrics.HeapValue.HEAP_USED,
(d) -> d >= MIN_HEAP_IN_MB && d <= MAX_HEAP_IN_MB,
RestConfig.PA_BASE_URI);
}

private void checkHeapMetric(AllMetrics.HeapValue metric, DoublePredicate metricValidator)
@Test
public void checkLegacyHeapUsed() throws Exception {
checkHeapMetric(
AllMetrics.HeapValue.HEAP_USED,
(d) -> d >= MIN_HEAP_IN_MB && d <= MAX_HEAP_IN_MB,
RestConfig.LEGACY_PA_BASE_URI);
}

private void checkHeapMetric(
AllMetrics.HeapValue metric, DoublePredicate metricValidator, String paBaseUri)
throws Exception {
// read metric from local node
List<JsonResponseNode> responseNodeList =
readMetric(
RestConfig.PA_BASE_URI
+ "/metrics/?metrics="
+ metric.toString()
+ "&agg=max");
readMetric(paBaseUri + "/metrics/?metrics=" + metric.toString() + "&agg=max");
Assert.assertEquals(1, responseNodeList.size());
validateHeapMetric(responseNodeList.get(0), metric, metricValidator);

// read metric from all nodes in cluster
responseNodeList =
readMetric(
RestConfig.PA_BASE_URI
paBaseUri
+ "/metrics/?metrics="
+ metric.toString()
+ "&agg=max&nodes=all");
Expand Down
45 changes: 33 additions & 12 deletions src/test/java/org/opensearch/performanceanalyzer/integ_test/PageFaultMetricsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,24 @@ public void init() throws Exception {

@Test
public void checkPaging_MajfltRate() throws Exception {
checkPaging_MajfltRate(RestConfig.PA_BASE_URI);
}

@Test
public void checkLegacyPaging_MajfltRate() throws Exception {
checkPaging_MajfltRate(RestConfig.LEGACY_PA_BASE_URI);
}

public void checkPaging_MajfltRate(String paBaseUri) throws Exception {
// read metric from local node
List<JsonResponseNode> responseNodeList =
readMetric(RestConfig.PA_BASE_URI + "/metrics/?metrics=Paging_MajfltRate&agg=max");
readMetric(paBaseUri + "/metrics/?metrics=Paging_MajfltRate&agg=max");
Assert.assertEquals(1, responseNodeList.size());
validateMajorPageFaultMetric(responseNodeList.get(0));

// read metric from all nodes in cluster
responseNodeList =
readMetric(
RestConfig.PA_BASE_URI
+ "/metrics/?metrics=Paging_MajfltRate&agg=max&nodes=all");
readMetric(paBaseUri + "/metrics/?metrics=Paging_MajfltRate&agg=max&nodes=all");
int nodeNum = getNodeIDs().size();
Assert.assertEquals(nodeNum, responseNodeList.size());
for (int i = 0; i < nodeNum; i++) {
Expand All @@ -66,17 +73,24 @@ public void checkPaging_MajfltRate() throws Exception {

@Test
public void checkPaging_MinfltRate() throws Exception {
checkPaging_MinfltRate(RestConfig.PA_BASE_URI);
}

@Test
public void checkLegacyPaging_MinfltRate() throws Exception {
checkPaging_MinfltRate(RestConfig.LEGACY_PA_BASE_URI);
}

public void checkPaging_MinfltRate(String paBaseUri) throws Exception {
// read metric from local node
List<JsonResponseNode> responseNodeList =
readMetric(RestConfig.PA_BASE_URI + "/metrics/?metrics=Paging_MinfltRate&agg=max");
readMetric(paBaseUri + "/metrics/?metrics=Paging_MinfltRate&agg=max");
Assert.assertEquals(1, responseNodeList.size());
validateMinorPageFaultMetric(responseNodeList.get(0));

// read metric from all nodes in cluster
responseNodeList =
readMetric(
RestConfig.PA_BASE_URI
+ "/metrics/?metrics=Paging_MinfltRate&agg=max&nodes=all");
readMetric(paBaseUri + "/metrics/?metrics=Paging_MinfltRate&agg=max&nodes=all");
int nodeNum = getNodeIDs().size();
Assert.assertEquals(nodeNum, responseNodeList.size());
for (int i = 0; i < nodeNum; i++) {
Expand All @@ -86,16 +100,23 @@ public void checkPaging_MinfltRate() throws Exception {

@Test
public void checkPaging_RSS() throws Exception {
checkPaging_RSS(RestConfig.PA_BASE_URI);
}

@Test
public void checkLegacyPaging_RSS() throws Exception {
checkPaging_RSS(RestConfig.LEGACY_PA_BASE_URI);
}

public void checkPaging_RSS(String paBaseUri) throws Exception {
// read metric from local node
List<JsonResponseNode> responseNodeList =
readMetric(RestConfig.PA_BASE_URI + "/metrics/?metrics=Paging_RSS&agg=max");
readMetric(paBaseUri + "/metrics/?metrics=Paging_RSS&agg=max");
Assert.assertEquals(1, responseNodeList.size());
validatePagingRSSMetric(responseNodeList.get(0));

// read metric from all nodes in cluster
responseNodeList =
readMetric(
RestConfig.PA_BASE_URI + "/metrics/?metrics=Paging_RSS&agg=max&nodes=all");
responseNodeList = readMetric(paBaseUri + "/metrics/?metrics=Paging_RSS&agg=max&nodes=all");
int nodeNum = getNodeIDs().size();
Assert.assertEquals(nodeNum, responseNodeList.size());
for (int i = 0; i < nodeNum; i++) {
Expand Down