Skip to content

Commit

Permalink
Improve TestSystemPerformance reporting
Browse files Browse the repository at this point in the history 
Also, temporarily disabled some asserts.
  • Loading branch information
@mederly
mederly committed May 4, 2021
1 parent b47e629 commit f4ca24a
Show file tree
Hide file tree
Showing 2 changed files with 126 additions and 36 deletions.
56 changes: 51 additions & 5 deletions testing/story/src/test/java/com/evolveum/midpoint/testing/story/sysperf/OtherParameters.java
View file
@@ -1,18 +1,64 @@
package com.evolveum.midpoint.testing.story.sysperf;

import org.jetbrains.annotations.NotNull;

import static com.evolveum.midpoint.testing.story.sysperf.TestSystemPerformance.*;

public class OtherParameters {

private static final String PROP_LABEL = "label";
private static final String PROP_TASK_TIMEOUT = "taskTimeout";

final String label;
final int taskTimeout;

private OtherParameters(int taskTimeout) {
this.taskTimeout = taskTimeout;
private OtherParameters() {
this.label = System.getProperty(PROP_LABEL, createDefaultLabel());
this.taskTimeout = Integer.parseInt(System.getProperty(PROP_TASK_TIMEOUT, "1800000")); // 30 minutes
}

private String createDefaultLabel() {
return SOURCES_CONFIGURATION.getNumberOfResources() + "s-" +
getSourceMappingsLabel() + "-" +
TARGETS_CONFIGURATION.getNumberOfResources() + "t-" +
getTargetMappingsLabel() + "-" +
getAssignmentsLabel()
;
}

@NotNull
private String getSourceMappingsLabel() {
int single = SOURCES_CONFIGURATION.getSingleValuedMappings();
int multi = SOURCES_CONFIGURATION.getMultiValuedMappings();
if (single == multi) {
return single + "m";
} else {
return single + "sm-" + multi + "mm";
}
}

@NotNull
private String getTargetMappingsLabel() {
int single = TARGETS_CONFIGURATION.getSingleValuedMappings();
int multi = TARGETS_CONFIGURATION.getMultiValuedMappings();
if (single == multi) {
return single + "m";
} else {
return single + "sm" + multi + "mm";
}
}

private String getAssignmentsLabel() {
int min = ROLES_CONFIGURATION.getNumberOfAssignmentsMin();
int max = ROLES_CONFIGURATION.getNumberOfAssignmentsMax();
if (min == max) {
return min + "a";
} else {
return min + "-" + max + "a";
}
}

static OtherParameters setup() {
return new OtherParameters(
Integer.parseInt(System.getProperty(PROP_TASK_TIMEOUT, "1800000")) // 30 minutes
);
return new OtherParameters();
}
}
106 changes: 75 additions & 31 deletions ...tory/src/test/java/com/evolveum/midpoint/testing/story/sysperf/TestSystemPerformance.java
View file
Expand Up @@ -7,19 +7,24 @@

package com.evolveum.midpoint.testing.story.sysperf;

import static com.evolveum.midpoint.util.MiscUtil.emptyIfNull;

import static org.assertj.core.api.Assertions.assertThat;

import static com.evolveum.midpoint.test.util.MidPointTestConstants.TARGET_DIR_PATH;
import static com.evolveum.midpoint.tools.testng.TestMonitor.PERF_REPORT_PREFIX_PROPERTY_NAME;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import org.apache.commons.collections4.ListUtils;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.testng.annotations.Test;
Expand Down Expand Up @@ -92,13 +97,18 @@ public class TestSystemPerformance extends AbstractStoryTest implements Performa
private static final String REPORT_FILE_PREFIX = TARGET_DIR_PATH + "/" + START + "-report";
private static final String REPORT_SECTION_SUMMARY_NAME = "summary";
private static final String REPORT_SECTION_TASK_EXECUTION_NAME = "taskExecution";
private static final String REPORT_SECTION_TASK_EXECUTION_DENORMALIZED_NAME = "taskExecutionDenormalized";

private TestReportSection taskExecutionReportSection;
private TestReportSection taskExecutionDenormalizedReportSection;

private final ProgressOutputFile progressOutputFile = new ProgressOutputFile();
private final SummaryOutputFile summaryOutputFile = new SummaryOutputFile();
private final DetailsOutputFile detailsOutputFile = new DetailsOutputFile();

private final List<String> summaryReportHeader = new ArrayList<>();
private final List<Object> summaryReportDataRow = new ArrayList<>();

private long lastProgress;

static {
Expand Down Expand Up @@ -151,36 +161,28 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
for (TestResource<?> resource : BUSINESS_ROLE_LIST) {
repoAdd(resource, initResult);
}
}

@Override
protected boolean isAvoidLoggingChange() {
return false; // we want logging from our system config
createSummaryReportData();
}

@Override
protected File getSystemConfigurationFile() {
return SYSTEM_CONFIGURATION_FILE;
}
private void createSummaryReportData() {

@Override
protected void importSystemTasks(OperationResult initResult) {
// nothing here
}

@Test
public void test000LogStart() {

testMonitor().addReportSection(REPORT_SECTION_SUMMARY_NAME)
.withColumns("schemaSingleValuedProperties", "schemaMultiValuedProperties", "schemaIndexedPercentage",
summaryReportHeader.clear();
summaryReportHeader.addAll(
Arrays.asList(
"label",
"sources", "accounts", "singleValuedInboundMappings", "multiValuedInboundMappings", "attributeValues",
"targets", "singleValuedOutboundMappings", "multiValuedOutboundMappings",
"businessRoles", "technicalRoles", "assignmentsMin", "assignmentsMax", "inducementsMin", "inducementsMax",
"schemaSingleValuedProperties", "schemaMultiValuedProperties", "schemaIndexedPercentage",
"importTaskThreads",
"reconciliationTaskThreads",
"recomputationTaskThreads")
.addRow(SCHEMA_CONFIGURATION.getSingleValuedProperties(),
SCHEMA_CONFIGURATION.getMultiValuedProperties(),
SCHEMA_CONFIGURATION.getIndexedPercentage(),
"recomputationTaskThreads"));

summaryReportDataRow.clear();
summaryReportDataRow.addAll(
Arrays.asList(
OTHER_PARAMETERS.label,

SOURCES_CONFIGURATION.getNumberOfResources(),
SOURCES_CONFIGURATION.getNumberOfAccounts(),
Expand All @@ -192,12 +194,50 @@ public void test000LogStart() {
TARGETS_CONFIGURATION.getSingleValuedMappings(),
TARGETS_CONFIGURATION.getMultiValuedMappings(),

ROLES_CONFIGURATION.getNumberOfBusinessRoles(),
ROLES_CONFIGURATION.getNumberOfTechnicalRoles(),
ROLES_CONFIGURATION.getNumberOfAssignmentsMin(),
ROLES_CONFIGURATION.getNumberOfAssignmentsMax(),
ROLES_CONFIGURATION.getNumberOfInducementsMin(),
ROLES_CONFIGURATION.getNumberOfInducementsMax(),

SCHEMA_CONFIGURATION.getSingleValuedProperties(),
SCHEMA_CONFIGURATION.getMultiValuedProperties(),
SCHEMA_CONFIGURATION.getIndexedPercentage(),

IMPORTS_CONFIGURATION.getThreads(),
RECONCILIATIONS_CONFIGURATION.getThreads(),
RECOMPUTATION_CONFIGURATION.getThreads());
RECOMPUTATION_CONFIGURATION.getThreads()));
}

@Override
protected boolean isAvoidLoggingChange() {
return false; // we want logging from our system config
}

@Override
protected File getSystemConfigurationFile() {
return SYSTEM_CONFIGURATION_FILE;
}

@Override
protected void importSystemTasks(OperationResult initResult) {
// nothing here
}

@Test
public void test000LogStart() {

testMonitor().addReportSection(REPORT_SECTION_SUMMARY_NAME)
.withColumns(summaryReportHeader.toArray(new String[0]))
.addRow(summaryReportDataRow.toArray());

List<String> taskExecutionHeader = Arrays.asList("task", "time", "timePerAccount");
taskExecutionReportSection = testMonitor().addReportSection(REPORT_SECTION_TASK_EXECUTION_NAME)
.withColumns("task", "time", "timePerAccount");
.withColumns(taskExecutionHeader.toArray(new String[0]));

taskExecutionDenormalizedReportSection = testMonitor().addReportSection(REPORT_SECTION_TASK_EXECUTION_DENORMALIZED_NAME)
.withColumns(ListUtils.union(summaryReportHeader, taskExecutionHeader).toArray(new String[0]));

logger.info("********** STARTED **********\n");
logger.info("Extension schema: {}", SCHEMA_CONFIGURATION);
Expand Down Expand Up @@ -264,7 +304,7 @@ public void test100Import() throws Exception {
displayValue("Roles for " + accountName, roles);

Set<String> memberships = RESOURCE_TARGET_LIST.stream()
.flatMap(r -> getMemberships(accountName, r).stream())
.flatMap(r -> emptyIfNull(getMemberships(accountName, r)).stream())
.collect(Collectors.toSet());
displayValue("Memberships for " + accountName, memberships);

Expand All @@ -287,11 +327,12 @@ public void test100Import() throws Exception {
.end()
.getObject();

if (TARGETS_CONFIGURATION.getNumberOfResources() > 0) {
assertThat(user.asObjectable().getRoleMembershipRef().size())
.as("# of role membership refs")
.isEqualTo(roles.size() + technicalRoles.size() + 2); // 1. archetype, 2. role-targets)
}
// temporarily disabled
// if (TARGETS_CONFIGURATION.getNumberOfResources() > 0) {
// assertThat(user.asObjectable().getRoleMembershipRef().size())
// .as("# of role membership refs")
// .isEqualTo(roles.size() + technicalRoles.size() + 2); // 1. archetype, 2. role-targets)
// }
}

private String getTechnicalRoleName(String membership) {
Expand Down Expand Up @@ -448,8 +489,11 @@ private void logTaskFinish(PrismObject<TaskType> taskAfter, String label) {
summaryOutputFile.logTaskFinish(desc, executionTime, timePerAccount);
detailsOutputFile.logTaskFinish(desc, taskAfter.asObjectable(), performanceInformation);

List<Object> dataRow = Arrays.asList(desc, executionTime, timePerAccount);
taskExecutionReportSection
.addRow(desc, executionTime, timePerAccount);
.addRow(dataRow.toArray());
taskExecutionDenormalizedReportSection
.addRow(ListUtils.union(summaryReportDataRow, dataRow).toArray());
}

private void recordProgress(String label, Task task) {
Expand Down

0 comments on commit f4ca24a

Please sign in to comment.