Skip to content

fix: JVM_ARGS should be parameterised and configured on jmeter pods #69

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix: JVM_ARGS should be parameterised and configured on jmeter pods #69

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d7e059
fix: JVM_ARGS should be parameterised and configured on jmeter pods
rahul2393 Apr 17, 2023
671c931
remove resource limit declaration
rahul2393 Apr 17, 2023
647851a
remove default pool
rahul2393 Apr 21, 2023
d0d4fc4
incorporate requested changes
rahul2393 Apr 21, 2023
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
12 changes: 12 additions & 0 deletions machmeter/src/main/java/com/google/cloud/machmeter/model/GKEConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ public class GKEConfig {
@Expose
private String nodeLocations;

@SerializedName(value = "jvm_args", alternate = "jvmArgs")
@Expose
private String jvmArgs;

@SerializedName(value = "min_count", alternate = "minCount")
@Expose
private int minCount;
Expand Down Expand Up @@ -153,6 +157,14 @@ public void setNodeLocations(String nodeLocations) {
this.nodeLocations = nodeLocations;
}

public String getJvmArgs() {
return jvmArgs;
}

public void setJvmArgs(String jvmArgs) {
this.jvmArgs = jvmArgs;
}

public int getMinCount() {
return minCount;
}
Expand Down
10 changes: 10 additions & 0 deletions machmeter/src/main/resources/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ variable "gke_config" {
service_account_json = string
machine_type = string
node_locations = string
jvm_args = string
min_count = number
max_count = number
initial_node_count = number
Expand Down Expand Up @@ -303,6 +304,10 @@ resource "kubernetes_deployment" "jmeter-master" {
name = "GOOGLE_APPLICATION_CREDENTIALS"
value = "/var/secrets/google/key.json"
}
env {
name = "JVM_ARGS"
value: var.gke_config.jvm_args
}
}
volume {
name = "loadtest"
Expand Down Expand Up @@ -380,6 +385,11 @@ resource "kubernetes_stateful_set" "jmeter-slave" {
env {
name = "GOOGLE_APPLICATION_CREDENTIALS"
value = "/var/secrets/google/key.json"

}
env {
name = "JVM_ARGS"
value: var.gke_config.jvm_args
}
}
volume {
Expand Down
3 changes: 2 additions & 1 deletion machmeter/usecases/education/learning-management-system/sample-configs/setup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"nodeLocations": "us-central1-a,us-central1-b,us-central1-c",
"minCount": 3,
"maxCount": 3,
"initialNodeCount": 3
"initialNodeCount": 3,
"jvmArgs": "-Xms1g -Xmx1g"
}
},
"ddlConfig" : {
Expand Down
3 changes: 2 additions & 1 deletion machmeter/usecases/entertainment/movies-database/sample-configs/setup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"nodeLocations": "us-central1-a,us-central1-b,us-central1-c",
"minCount": 3,
"maxCount": 3,
"initialNodeCount": 3
"initialNodeCount": 3,
"jvmArgs": "-Xms1g -Xmx1g"
Copy link
Contributor

@surbhigarg92 surbhigarg92 Apr 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should add a default value for jvmArgs in GKEConfig as -Xms1g -Xmx1g and not mention it in setup.json. Only when we want to override we should pass the value . WDYT?

Copy link
Collaborator Author

@rahul2393 rahul2393 Apr 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

}
},
"ddlConfig" : {
Expand Down
3 changes: 2 additions & 1 deletion machmeter/usecases/finance/ledger/sample-configs/setup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"nodeLocations": "us-central1-a,us-central1-b,us-central1-c",
"minCount": 3,
"maxCount": 3,
"initialNodeCount": 3
"initialNodeCount": 3,
"jvmArgs": "-Xms1g -Xmx1g"
}
},
"ddlConfig" : {
Expand Down
3 changes: 2 additions & 1 deletion machmeter/usecases/shopping/cart/sample-configs/setup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"nodeLocations": "us-central1-a,us-central1-b,us-central1-c",
"minCount": 3,
"maxCount": 3,
"initialNodeCount": 3
"initialNodeCount": 3,
"jvmArgs": "-Xms1g -Xmx1g"
}
},
"ddlConfig" : {
Expand Down