This repository has been archived by the owner on Mar 3, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 594
Change YarnKeys to enum #1707
Merged
Merged
Change YarnKeys to enum #1707
Changes from all commits
Commits
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 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
67 changes: 67 additions & 0 deletions
67
heron/schedulers/src/java/com/twitter/heron/scheduler/yarn/YarnKey.java
This file contains 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,67 @@ | ||
// Copyright 2017 Twitter. All rights reserved. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package com.twitter.heron.scheduler.yarn; | ||
|
||
import com.twitter.heron.spi.common.Key; | ||
|
||
/** | ||
* Keys specific to the YARN scheduler | ||
*/ | ||
public enum YarnKey { | ||
// yarn queue for submitting and launching the topology | ||
HERON_SCHEDULER_YARN_QUEUE("heron.scheduler.yarn.queue", "default"), | ||
// the amount of memory topology's driver (yarn application master) needs | ||
YARN_SCHEDULER_DRIVER_MEMORY_MB("heron.scheduler.yarn.driver.memory.mb", 2048); | ||
|
||
private final String value; | ||
private final Key.Type type; | ||
private final Object defaultValue; | ||
|
||
YarnKey(String value, String defaultValue) { | ||
this.value = value; | ||
this.type = Key.Type.STRING; | ||
this.defaultValue = defaultValue; | ||
} | ||
|
||
YarnKey(String value, Integer defaultValue) { | ||
this.value = value; | ||
this.type = Key.Type.INTEGER; | ||
this.defaultValue = defaultValue; | ||
} | ||
|
||
public String value() { | ||
return value; | ||
} | ||
|
||
public Object getDefault() { | ||
return defaultValue; | ||
} | ||
|
||
public String getDefaultString() { | ||
if (type != Key.Type.STRING) { | ||
throw new IllegalAccessError(String.format( | ||
"Config Key %s is type %s, getDefaultString() not supported", this.name(), this.type)); | ||
} | ||
return (String) this.defaultValue; | ||
} | ||
|
||
public int getDefaultInt() { | ||
if (type != Key.Type.INTEGER) { | ||
throw new IllegalAccessError(String.format( | ||
"Config Key %s is type %s, getDefaultInt() not supported", this.name(), this.type)); | ||
} | ||
return (Integer) this.defaultValue; | ||
} | ||
} |
This file contains 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
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.
Instead of using int, can we change this to
ByteAmount
and drop '.mb' from the key value (see https://github.com/twitter/heron/blob/master/heron/spi/src/java/com/twitter/heron/spi/common/Key.java#L104)? We could then useByteAmount
everywhere and then callasMegabytes
before adding it to the yarn config, which I suspect requires MBs.If this would trigger a large refactor, I'm fine with shipping this as-is and following up with the
ByteAmount
change in it's own PR.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.
@billonahill - Thanks for reviewing. It will be great if we change
driver.memory.mb
from int toByteAmount
. I would like to send another PR for this. BTW, dropping '.mb' might be not good for users cause they need to know the unit of this parameter.