Increase admin ideal to track reality
@@ -32,6 +32,7 @@ public class ClusterModel {
static final double idealQueryCpuLoad = 0.8;
static final double idealWriteCpuLoad = 0.95;
static final double idealMemoryLoad = 0.65;
+ static final double idealAdminMemoryLoad = 0.75;
static final double idealContainerDiskLoad = 0.95;
static final double idealContentDiskLoad = 0.6;
@@ -207,7 +208,7 @@ public class ClusterModel {
* if one of the nodes go down.
*/
public Load idealLoad() {
- return new Load(idealCpuLoad(), idealMemoryLoad, idealDiskLoad()).divide(redundancyAdjustment());
+ return new Load(idealCpuLoad(), idealMemoryLoad(), idealDiskLoad()).divide(redundancyAdjustment());
}
public int nodesAdjustedForRedundancy(int nodes, int groups) {
@@ -307,6 +308,12 @@ public class ClusterModel {
return duration;
}
+ private double idealMemoryLoad() {
+ if (clusterSpec.type() == ClusterSpec.Type.admin)
+ return idealAdminMemoryLoad; // Not autoscaled, but ideal shown in console
+ return idealMemoryLoad;
+ }
+
private double idealDiskLoad() {
// Stateless clusters are not expected to consume more disk over time -
// if they do it is due to logs which will be rotated away right before the disk is full
