-
Notifications
You must be signed in to change notification settings - Fork 2.8k
[ZEPPELIN-4799] Use spark resource configuration #3761
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.
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
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
...auncher/k8s-standard/src/main/java/org/apache/zeppelin/interpreter/launcher/K8sUtils.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package org.apache.zeppelin.interpreter.launcher; | ||
|
|
||
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| import org.apache.commons.lang3.StringUtils; | ||
|
|
||
| public class K8sUtils { | ||
|
|
||
| private static final long K = 1024; | ||
| private static final long M = K * K; | ||
| private static final long G = M * K; | ||
| private static final long T = G * K; | ||
| private static final long MINIMUM_OVERHEAD = 384; | ||
|
|
||
| private K8sUtils() { | ||
| // do nothing | ||
| } | ||
|
|
||
| public static String calculateMemoryWithDefaultOverhead(String memory) { | ||
| long memoryMB = convertToBytes(memory) / M; | ||
| long memoryOverheadMB = Math.max((long) (memoryMB * 0.1f), MINIMUM_OVERHEAD); | ||
| return (memoryMB + memoryOverheadMB) + "Mi"; | ||
| } | ||
|
|
||
| public static String calculateSparkMemory(String memory, String memoryOverhead) { | ||
| long memoryMB = convertToBytes(memory) / M; | ||
| long memoryOverheadMB = convertToBytes(memoryOverhead) / M; | ||
| return (memoryMB + memoryOverheadMB) + "Mi"; | ||
| } | ||
|
|
||
| private static long convertToBytes(String memory) { | ||
| String lower = memory.toLowerCase().trim(); | ||
| Matcher m = Pattern.compile("([0-9]+)([a-z]+)?").matcher(lower); | ||
| long value; | ||
| String suffix; | ||
| if (m.matches()) { | ||
| value = Long.parseLong(m.group(1)); | ||
| suffix = m.group(2); | ||
| } else { | ||
| throw new NumberFormatException("Failed to parse string: " + memory); | ||
| } | ||
|
|
||
| long memoryAmountBytes = value; | ||
| if (StringUtils.containsIgnoreCase(suffix, "k")) { | ||
| memoryAmountBytes = value * K; | ||
| } else if (StringUtils.containsIgnoreCase(suffix, "m")) { | ||
| memoryAmountBytes = value * M; | ||
| } else if (StringUtils.containsIgnoreCase(suffix, "g")) { | ||
| memoryAmountBytes = value * G; | ||
| } else if (StringUtils.containsIgnoreCase(suffix, "t")) { | ||
| memoryAmountBytes = value * T; | ||
| } | ||
| if (0 > memoryAmountBytes) { | ||
| throw new NumberFormatException("Conversion of " + memory + " exceeds Long.MAX_VALUE"); | ||
| } | ||
| return memoryAmountBytes; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
...her/k8s-standard/src/test/java/org/apache/zeppelin/interpreter/launcher/K8sUtilsTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package org.apache.zeppelin.interpreter.launcher; | ||
|
|
||
| import static org.junit.Assert.*; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| public class K8sUtilsTest { | ||
|
|
||
| @Test | ||
| public void testConvert() { | ||
| assertEquals("484Mi", K8sUtils.calculateMemoryWithDefaultOverhead("100m")); | ||
| assertEquals("1408Mi", K8sUtils.calculateMemoryWithDefaultOverhead("1Gb")); | ||
| assertEquals("4505Mi", K8sUtils.calculateMemoryWithDefaultOverhead("4Gb")); | ||
| assertEquals("6758Mi", K8sUtils.calculateMemoryWithDefaultOverhead("6Gb")); | ||
| assertEquals("9011Mi", K8sUtils.calculateMemoryWithDefaultOverhead("8Gb")); | ||
| // some extrem values | ||
| assertEquals("112640Mi", K8sUtils.calculateMemoryWithDefaultOverhead("100Gb")); | ||
| assertEquals("115343360Mi", K8sUtils.calculateMemoryWithDefaultOverhead("100Tb")); | ||
| } | ||
|
|
||
| @Test(expected = NumberFormatException.class) | ||
| public void testExceptionMaxLong() { | ||
| K8sUtils.calculateMemoryWithDefaultOverhead("10000000Tb"); | ||
| } | ||
|
|
||
| @Test(expected = NumberFormatException.class) | ||
| public void testExceptionNoValidNumber() { | ||
| K8sUtils.calculateMemoryWithDefaultOverhead("NoValidNumber10000000Tb"); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit - How about adding some short comments here about why
limits.memoryis not configured? maybe a link to this pull request description? So later, other people can see this as a intentional when read the code.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.