ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-18 20:47:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

TM-10 - Parallelise DB integration tests (postgres) (#5704)

Browse Source
This commit is contained in:
cairncross 2019-11-15 14:46:53 +00:00 committed by Stefano Franz
parent 57bd5d5af2
commit b48a714aaa
3 changed files with 97 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/groovy/net/corda/testing/DistributedTesting.groovy
View File

@ -117,6 +117,8 @@ class DistributedTesting implements Plugin<Project> {
podLogLevel = testGrouping.getLogLevel()
doFirst {
dockerTag = tagToUseForRunningTests ? (ImageBuilding.registryName + ":" + tagToUseForRunningTests) : (imagePushTask.imageName.get() + ":" + imagePushTask.tag.get())
sidecarImage = testGrouping.sidecarImage
additionalArgs = testGrouping.additionalArgs
}
}
def reportOnAllTask = project.rootProject.tasks.create("userDefinedReports${testGrouping.getName().capitalize()}", KubesReporting) {

85
buildSrc/src/main/groovy/net/corda/testing/KubesTest.java
View File

@ -68,7 +68,9 @@ public class KubesTest extends DefaultTask {
String dockerTag;
String fullTaskToExecutePath;
String taskToExecuteName;
String sidecarImage;
Boolean printOutput = false;
List<String> additionalArgs;
Integer numberOfCoresPerFork = 4;
Integer memoryGbPerFork = 6;
@ -229,7 +231,7 @@ public class KubesTest extends DefaultTask {
}
}
getProject().getLogger().lifecycle("creating pod: " + podName);
createdPod = client.pods().inNamespace(namespace).create(buildPodRequest(podName, pvc));
createdPod = client.pods().inNamespace(namespace).create(buildPodRequest(podName, pvc, sidecarImage != null));
remainingPods.add(podName);
getProject().getLogger().lifecycle("scheduled pod: " + podName);
}
@ -287,20 +289,27 @@ public class KubesTest extends DefaultTask {
String[] buildCommand = getBuildCommand(numberOfPods, podIdx);
getProject().getLogger().quiet("About to execute " + Arrays.stream(buildCommand).reduce("", (s, s2) -> s + " " + s2) + " on pod " + podName);
client.pods().inNamespace(namespace).withName(podName)
.inContainer(podName)
.writingOutput(stdOutOs)
.writingErrorChannel(errChannelStream)
.usingListener(execListener)
.exec(getBuildCommand(numberOfPods, podIdx));
.exec(buildCommand);
return startLogPumping(stdOutIs, podIdx, podLogsDirectory, printOutput);
}
private Pod buildPodRequest(String podName, PersistentVolumeClaim pvc) {
private Pod buildPodRequest(String podName, PersistentVolumeClaim pvc, boolean withDb) {
if (withDb) {
return buildPodRequestWithWorkerNodeAndDbContainer(podName, pvc);
} else {
return buildPodRequestWithOnlyWorkerNode(podName, pvc);
}
}
private Pod buildPodRequestWithOnlyWorkerNode(String podName, PersistentVolumeClaim pvc) {
return new PodBuilder()
.withNewMetadata().withName(podName).endMetadata()
.withNewSpec()
.addNewVolume()
.withName("gradlecache")
.withNewHostPath()
@ -327,19 +336,77 @@ public class KubesTest extends DefaultTask {
.withName(podName)
.withNewResources()
.addToRequests("cpu", new Quantity(numberOfCoresPerFork.toString()))
.addToRequests("memory", new Quantity(memoryGbPerFork.toString() + "Gi"))
.addToRequests("memory", new Quantity(memoryGbPerFork.toString()))
.endResources()
.addNewVolumeMount().withName("gradlecache").withMountPath("/tmp/gradle").endVolumeMount()
.addNewVolumeMount().withName("testruns").withMountPath(TEST_RUN_DIR).endVolumeMount()
.endContainer()
.addNewImagePullSecret(REGISTRY_CREDENTIALS_SECRET_NAME)
.withRestartPolicy("Never")
.endSpec()
.build();
}
private Pod buildPodRequestWithWorkerNodeAndDbContainer(String podName, PersistentVolumeClaim pvc) {
return new PodBuilder()
.withNewMetadata().withName(podName).endMetadata()
.withNewSpec()
.addNewVolume()
.withName("gradlecache")
.withNewHostPath()
.withType("DirectoryOrCreate")
.withPath("/tmp/gradle")
.endHostPath()
.endVolume()
.addNewVolume()
.withName("testruns")
.withNewPersistentVolumeClaim()
.withClaimName(pvc.getMetadata().getName())
.endPersistentVolumeClaim()
.endVolume()
.addNewContainer()
.withImage(dockerTag)
.withCommand("bash")
.withArgs("-c", "sleep 3600")
.addNewEnv()
.withName("DRIVER_NODE_MEMORY")
.withValue("1024m")
.withName("DRIVER_WEB_MEMORY")
.withValue("1024m")
.endEnv()
.withName(podName)
.withNewResources()
.addToRequests("cpu", new Quantity(Integer.valueOf(numberOfCoresPerFork - 1).toString()))
.addToRequests("memory", new Quantity(Integer.valueOf(memoryGbPerFork - 1).toString() + "Gi"))
.endResources()
.addNewVolumeMount().withName("gradlecache").withMountPath("/tmp/gradle").endVolumeMount()
.addNewVolumeMount().withName("testruns").withMountPath(TEST_RUN_DIR).endVolumeMount()
.endContainer()
.addNewContainer()
.withImage(sidecarImage)
.addNewEnv()
.withName("DRIVER_NODE_MEMORY")
.withValue("1024m")
.withName("DRIVER_WEB_MEMORY")
.withValue("1024m")
.endEnv()
.withName(podName + "-pg")
.withNewResources()
.addToRequests("cpu", new Quantity("1"))
.addToRequests("memory", new Quantity("1Gi"))
.endResources()
.endContainer()
.addNewImagePullSecret(REGISTRY_CREDENTIALS_SECRET_NAME)
.withRestartPolicy("Never")
.endSpec()
.build();
}
private File startLogPumping(InputStream stdOutIs, int podIdx, File podLogsDirectory, boolean printOutput) throws IOException {
File outputFile = new File(podLogsDirectory, "container-" + podIdx + ".log");
outputFile.createNewFile();
@ -405,6 +472,7 @@ public class KubesTest extends DefaultTask {
client.pods()
.inNamespace(namespace)
.withName(podName)
.inContainer(podName)
.dir(resultsInContainerPath)
.copy(tempDir);
}
@ -416,6 +484,7 @@ public class KubesTest extends DefaultTask {
final String gitTargetBranch = " -Dgit.target.branch=" + Properties.getTargetGitBranch();
final String artifactoryUsername = " -Dartifactory.username=" + Properties.getUsername() + " ";
final String artifactoryPassword = " -Dartifactory.password=" + Properties.getPassword() + " ";
final String additionalArgs = this.additionalArgs.isEmpty() ? "" : String.join(" ", this.additionalArgs);
String shellScript = "(let x=1 ; while [ ${x} -ne 0 ] ; do echo \"Waiting for DNS\" ; curl services.gradle.org > /dev/null 2>&1 ; x=$? ; sleep 1 ; done ) && "
+ " cd /tmp/source && " +
@ -425,7 +494,7 @@ public class KubesTest extends DefaultTask {
gitTargetBranch +
artifactoryUsername +
artifactoryPassword +
"-Dkubenetize -PdockerFork=" + podIdx + " -PdockerForks=" + numberOfPods + " " + fullTaskToExecutePath + " " + getLoggingLevel() + " 2>&1) ; " +
"-Dkubenetize -PdockerFork=" + podIdx + " -PdockerForks=" + numberOfPods + " " + fullTaskToExecutePath + " " + additionalArgs + " " + getLoggingLevel() + " 2>&1) ; " +
"let rs=$? ; sleep 10 ; exit ${rs}";
return new String[]{"bash", "-c", shellScript};
}

18
buildSrc/src/main/groovy/net/corda/testing/ParallelTestGroup.java
View File

@ -15,6 +15,8 @@ public class ParallelTestGroup extends DefaultTask {
private int gbOfMemory = 4;
private boolean printToStdOut = true;
private PodLogLevel logLevel = PodLogLevel.INFO;
private String sidecarImage;
private List<String> additionalArgs = new ArrayList<>();
public DistributeTestsBy getDistribution() {
return distribution;
@ -44,6 +46,10 @@ public class ParallelTestGroup extends DefaultTask {
return logLevel;
}
public String getSidecarImage() { return sidecarImage; }
public List<String> getAdditionalArgs() { return additionalArgs; }
public void numberOfShards(int shards) {
this.shardCount = shards;
}
@ -77,4 +83,16 @@ public class ParallelTestGroup extends DefaultTask {
groups.addAll(group);
}
public void sidecarImage(String sidecarImage) {
this.sidecarImage = sidecarImage;
}
public void additionalArgs(String... additionalArgs) {
additionalArgs(Arrays.asList(additionalArgs));
}
private void additionalArgs(List<String> additionalArgs) {
this.additionalArgs.addAll(additionalArgs);
}
}