Skip to content

[FLINK-22505][core] Limit the scale of Resource to 8 #15815

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

Closed
wants to merge 1 commit into from
Closed

[FLINK-22505][core] Limit the scale of Resource to 8 #15815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions flink-core/src/main/java/org/apache/flink/api/common/resources/Resource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,18 @@
import static org.apache.flink.util.Preconditions.checkArgument;
import static org.apache.flink.util.Preconditions.checkNotNull;

/** Base class for resources one can specify. */
/**
* Base class for resources one can specify. Notice that the scale of value will be limited to
* {@link #MAX_VALUE_SCALE} and all the trailing zeros will be stripped for readability.
*/
@Internal
public abstract class Resource<T extends Resource<T>>
implements Serializable, Comparable<Resource> {

private static final long serialVersionUID = 1L;

private static final int MAX_VALUE_SCALE = 8;

private final String name;

private final BigDecimal value;
Expand All @@ -45,11 +50,14 @@ protected Resource(String name, double value) {

protected Resource(String name, BigDecimal value) {
checkNotNull(value);
final BigDecimal valueRoundDown =
value.setScale(MAX_VALUE_SCALE, RoundingMode.DOWN).stripTrailingZeros();
checkArgument(
value.compareTo(BigDecimal.ZERO) >= 0, "Resource value must be no less than 0");
valueRoundDown.compareTo(BigDecimal.ZERO) >= 0,
"Resource value must be no less than 0");

this.name = checkNotNull(name);
this.value = value;
this.value = valueRoundDown;
}

public T merge(T other) {
Expand Down Expand Up @@ -80,7 +88,7 @@ public T multiply(int multiplier) {
}

public T divide(BigDecimal by) {
return create(value.divide(by, 16, RoundingMode.DOWN));
return create(value.divide(by, MAX_VALUE_SCALE, RoundingMode.DOWN));
}

public T divide(int by) {
Expand Down
16 changes: 16 additions & 0 deletions flink-core/src/test/java/org/apache/flink/api/common/resources/ResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,22 @@ public void testCompareToFailDifferentName() {
resource1.compareTo(resource2);
}

/** This test assume that the scale limitation is 8. */
@Test
public void testValueScaleLimited() {
final Resource v1 = new TestResource(0.100000001);
assertTestResourceValueEquals(0.1, v1);

final Resource v2 = new TestResource(1.0).divide(3);
assertTestResourceValueEquals(0.33333333, v2);
}

@Test
public void testStripTrailingZeros() {
final Resource v = new TestResource(0.25).multiply(2);
assertThat(v.getValue().toString(), is("0.5"));
}

private static void assertTestResourceValueEquals(final double value, final Resource resource) {
assertEquals(new TestResource(value), resource);
}
Expand Down
14 changes: 12 additions & 2 deletions ...rnetes/src/test/java/org/apache/flink/kubernetes/KubernetesResourceManagerDriverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,12 @@ protected void validateRequestedResources(
.getMebiBytes())));
assertThat(
resourceRequirements.getRequests().get(Constants.RESOURCE_NAME_CPU).getAmount(),
is(String.valueOf(taskExecutorProcessSpec.getCpuCores().getValue())));
is(
String.valueOf(
taskExecutorProcessSpec
.getCpuCores()
.getValue()
.doubleValue())));

assertThat(
resourceRequirements
Expand All @@ -376,7 +381,12 @@ protected void validateRequestedResources(
.getMebiBytes())));
assertThat(
resourceRequirements.getLimits().get(Constants.RESOURCE_NAME_CPU).getAmount(),
is(String.valueOf(taskExecutorProcessSpec.getCpuCores().getValue())));
is(
String.valueOf(
taskExecutorProcessSpec
.getCpuCores()
.getValue()
.doubleValue())));
}

@Override
Expand Down