Skip to content
This repository was archived by the owner on Feb 16, 2026. It is now read-only.

Commit f1edc88

Browse files
rahul2393rahul2393
committed
incorporate requested changes
1 parent 647851a commit f1edc88

6 files changed

Lines changed: 158 additions & 18 deletions

File tree

‎machmeter/src/main/java/com/google/cloud/machmeter/model/GKEConfig.java‎

Lines changed: 132 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@
2121

2222
public class GKEConfig {
2323

24+
private static final String DEFAULT_JVM_ARGS = "-Xms1g -Xmx1g";
25+
private static final int DEFAULT_SLAVE_REPLICA_COUNT = 2;
26+
27+
private static final String DEFAULT_CPU_REQUEST = "1000m";
28+
29+
private static final String DEFAULT_MEMORY_REQUEST = "1Gi";
30+
2431
@SerializedName(value = "cluster_name", alternate = "clusterName")
2532
@Expose
2633
private String clusterName;
@@ -61,9 +68,33 @@ public class GKEConfig {
6168
@Expose
6269
private String nodeLocations;
6370

64-
@SerializedName(value = "jvm_args", alternate = "jvmArgs")
71+
@SerializedName(value = "master_jvm_args", alternate = "masterJvmArgs")
72+
@Expose
73+
private String masterJvmArgs;
74+
75+
@SerializedName(value = "slave_jvm_args", alternate = "slaveJvmArgs")
76+
@Expose
77+
private String slaveJvmArgs;
78+
79+
@SerializedName(value = "master_cpu_request", alternate = "masterCPURequest")
80+
@Expose
81+
private String masterCPURequest;
82+
83+
@SerializedName(value = "master_memory_request", alternate = "masterMemoryRequest")
84+
@Expose
85+
private String masterMemoryRequest;
86+
87+
@SerializedName(value = "slave_cpu_request", alternate = "slaveCPURequest")
88+
@Expose
89+
private String slaveCPURequest;
90+
91+
@SerializedName(value = "slave_memory_request", alternate = "slaveMemoryRequest")
92+
@Expose
93+
private String slaveMemoryRequest;
94+
95+
@SerializedName(value = "slave_replica_count", alternate = "slaveReplicaCount")
6596
@Expose
66-
private String jvmArgs;
97+
private int slaveReplicaCount;
6798

6899
@SerializedName(value = "min_count", alternate = "minCount")
69100
@Expose
@@ -157,12 +188,107 @@ public void setNodeLocations(String nodeLocations) {
157188
this.nodeLocations = nodeLocations;
158189
}
159190

160-
public String getJvmArgs() {
161-
return jvmArgs;
191+
public String getMasterJvmArgs() {
192+
if (masterJvmArgs == null) masterJvmArgs = DEFAULT_JVM_ARGS;
193+
;
194+
return masterJvmArgs;
195+
}
196+
197+
public void setMasterJvmArgs(String masterJvmArgs) {
198+
if (masterJvmArgs == null) {
199+
this.masterJvmArgs = DEFAULT_JVM_ARGS;
200+
return;
201+
}
202+
this.masterJvmArgs = masterJvmArgs;
203+
}
204+
205+
public String getSlaveJvmArgs() {
206+
if (slaveJvmArgs == null) slaveJvmArgs = DEFAULT_JVM_ARGS;
207+
;
208+
return slaveJvmArgs;
209+
}
210+
211+
public void setSlaveJvmArgs(String slaveJvmArgs) {
212+
if (slaveJvmArgs == null) {
213+
this.slaveJvmArgs = DEFAULT_JVM_ARGS;
214+
return;
215+
}
216+
this.slaveJvmArgs = slaveJvmArgs;
217+
}
218+
219+
public String getMasterCPURequest() {
220+
if (masterCPURequest == null) masterCPURequest = DEFAULT_CPU_REQUEST;
221+
;
222+
return masterCPURequest;
223+
}
224+
225+
public void setMasterCPURequest(String masterCPURequest) {
226+
if (masterCPURequest == null) {
227+
this.masterCPURequest = DEFAULT_CPU_REQUEST;
228+
return;
229+
}
230+
;
231+
this.masterCPURequest = masterCPURequest;
232+
}
233+
234+
public String getMasterMemoryRequest() {
235+
if (masterMemoryRequest == null) masterMemoryRequest = DEFAULT_MEMORY_REQUEST;
236+
;
237+
return masterMemoryRequest;
238+
}
239+
240+
public void setMasterMemoryRequest(String masterMemoryRequest) {
241+
if (masterMemoryRequest == null) {
242+
this.masterMemoryRequest = DEFAULT_MEMORY_REQUEST;
243+
return;
244+
}
245+
;
246+
this.masterMemoryRequest = masterMemoryRequest;
247+
}
248+
249+
public String getSlaveCPURequest() {
250+
if (slaveCPURequest == null) slaveCPURequest = DEFAULT_MEMORY_REQUEST;
251+
;
252+
return slaveCPURequest;
253+
}
254+
255+
public void setSlaveCPURequest(String slaveCPURequest) {
256+
if (slaveCPURequest == null) {
257+
this.slaveCPURequest = DEFAULT_CPU_REQUEST;
258+
return;
259+
}
260+
;
261+
this.slaveCPURequest = slaveCPURequest;
262+
}
263+
264+
public String getSlaveMemoryRequest() {
265+
if (slaveMemoryRequest == null) slaveMemoryRequest = DEFAULT_MEMORY_REQUEST;
266+
;
267+
return slaveMemoryRequest;
268+
}
269+
270+
public void setSlaveMemoryRequest(String slaveMemoryRequest) {
271+
if (slaveMemoryRequest == null) {
272+
this.slaveMemoryRequest = DEFAULT_MEMORY_REQUEST;
273+
return;
274+
}
275+
;
276+
this.slaveMemoryRequest = slaveMemoryRequest;
277+
}
278+
279+
public int getSlaveReplicaCount() {
280+
if (slaveReplicaCount <= 0) slaveReplicaCount = DEFAULT_SLAVE_REPLICA_COUNT;
281+
;
282+
return slaveReplicaCount;
162283
}
163284

164-
public void setJvmArgs(String jvmArgs) {
165-
this.jvmArgs = jvmArgs;
285+
public void setSlaveReplicaCount(int slaveReplicaCount) {
286+
if (slaveReplicaCount <= 0) {
287+
this.slaveReplicaCount = DEFAULT_SLAVE_REPLICA_COUNT;
288+
return;
289+
}
290+
;
291+
this.slaveReplicaCount = slaveReplicaCount;
166292
}
167293

168294
public int getMinCount() {

‎machmeter/src/main/resources/terraform/main.tf‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,13 @@ variable "gke_config" {
2828
service_account_json = string
2929
machine_type = string
3030
node_locations = string
31-
jvm_args = string
31+
master_jvm_args = string
32+
slave_jvm_args = string
33+
master_cpu_request = string
34+
master_memory_request = string
35+
slave_cpu_request = string
36+
slave_memory_request = string
37+
slave_replica_count = number
3238
min_count = number
3339
max_count = number
3440
initial_node_count = number
@@ -300,13 +306,19 @@ resource "kubernetes_deployment" "jmeter-master" {
300306
port {
301307
container_port = 60000
302308
}
309+
resources {
310+
requests = {
311+
cpu = var.gke_config.master_cpu_request
312+
memory = var.gke_config.master_memory_request
313+
}
314+
}
303315
env {
304316
name = "GOOGLE_APPLICATION_CREDENTIALS"
305317
value = "/var/secrets/google/key.json"
306318
}
307319
env {
308320
name = "JVM_ARGS"
309-
value: var.gke_config.jvm_args
321+
value: var.gke_config.master_jvm_args
310322
}
311323
}
312324
volume {
@@ -341,7 +353,7 @@ resource "kubernetes_stateful_set" "jmeter-slave" {
341353
}
342354
spec {
343355
service_name = "jmeter-slaves"
344-
replicas = 2
356+
replicas = var.gke_config.slave_replica_count
345357
selector {
346358
match_labels = {
347359
jmeter_mode = "slave"
@@ -372,14 +384,20 @@ resource "kubernetes_stateful_set" "jmeter-slave" {
372384
port {
373385
container_port = 50000
374386
}
387+
resources {
388+
requests = {
389+
cpu = var.gke_config.slave_cpu_request
390+
memory = var.gke_config.slave_memory_request
391+
}
392+
}
375393
env {
376394
name = "GOOGLE_APPLICATION_CREDENTIALS"
377395
value = "/var/secrets/google/key.json"
378396

379397
}
380398
env {
381399
name = "JVM_ARGS"
382-
value: var.gke_config.jvm_args
400+
value: var.gke_config.slave_jvm_args
383401
}
384402
}
385403
volume {

‎machmeter/usecases/education/learning-management-system/sample-configs/setup.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
"nodeLocations": "us-central1-a,us-central1-b,us-central1-c",
2323
"minCount": 3,
2424
"maxCount": 3,
25-
"initialNodeCount": 3,
26-
"jvmArgs": "-Xms1g -Xmx1g"
25+
"initialNodeCount": 3
2726
}
2827
},
2928
"ddlConfig" : {

‎machmeter/usecases/entertainment/movies-database/sample-configs/setup.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
"nodeLocations": "us-central1-a,us-central1-b,us-central1-c",
2323
"minCount": 3,
2424
"maxCount": 3,
25-
"initialNodeCount": 3,
26-
"jvmArgs": "-Xms1g -Xmx1g"
25+
"initialNodeCount": 3
2726
}
2827
},
2928
"ddlConfig" : {

‎machmeter/usecases/finance/ledger/sample-configs/setup.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
"nodeLocations": "us-central1-a,us-central1-b,us-central1-c",
2323
"minCount": 3,
2424
"maxCount": 3,
25-
"initialNodeCount": 3,
26-
"jvmArgs": "-Xms1g -Xmx1g"
25+
"initialNodeCount": 3
2726
}
2827
},
2928
"ddlConfig" : {

‎machmeter/usecases/shopping/cart/sample-configs/setup.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
"nodeLocations": "us-central1-a,us-central1-b,us-central1-c",
2323
"minCount": 3,
2424
"maxCount": 3,
25-
"initialNodeCount": 3,
26-
"jvmArgs": "-Xms1g -Xmx1g"
25+
"initialNodeCount": 3
2726
}
2827
},
2928
"ddlConfig" : {

0 commit comments

Comments
 (0)