Skip to content
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

cleanup: remove obsolete mesos configuration #5144

Merged
merged 1 commit into from
Jul 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 0 additions & 28 deletions common/scala/src/main/resources/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -482,34 +482,6 @@ whisk {
default-list-limit = 30 # default limit on number of entities returned from a collection on a list operation
}

mesos {
master-url = "http://localhost:5050" //your mesos master
master-public-url = "http://localhost:5050" // if mesos-link-log-message == true, this link will be included with the static log message (may or may not be different from master-url)
role = "*" //see http://mesos.apache.org/documentation/latest/roles/#associating-frameworks-with-roles
mesos-link-log-message = true //If true, display a link to mesos in the static log message, otherwise do not include a link to mesos.
constraints = [] //placement constraint strings to use for managed containers e.g. ["att1 LIKE v1", "att2 UNLIKE v2"]
blackbox-constraints = [] //placement constraints to use for blackbox containers
constraint-delimiter = " "//used to parse constraint strings
teardown-on-exit = true //set to true to disable the mesos framework on system exit; set for false for HA deployments
offer-refuse-duration = 5 seconds //minimum time until an offer will arrive again at a particular invoker
heartbeat-max-failures = 2 //number of missed heartbeats from mesos master until resubscribe
timeouts {
failover = 0 seconds //Timeout allowed for framework to reconnect after disconnection.
task-launch = 45 seconds //timeout for creating mesos tasks (containers)
task-delete = 30 seconds //timeout for destroying mesos tasks (containers)
subscribe = 10 seconds //timeout for framework subscription handshake
teardown = 30 seconds //timeout for framework teardown
}
health-check {#Remove health-section section to disable healthchecks at action containers
port-index = 0 //should always be port 0 (action container should only listen on 1 port)
delay = 0 seconds //the amount of time (in seconds) to wait until starting checking the task.
interval = 1 seconds //the interval (in seconds) between check attempts.
timeout = 1 seconds //the amount of time (in seconds) to wait for the check to complete
grace-period = 25 seconds //the amount of time after the task is launched during which health check failures are ignored.
max-consecutive-failures = 3 //the number of consecutive failures until the task is killed by the executor.
}
}

yarn {
master-url="http://localhost:8088" //YARN Resource Manager endpoint to be accessed from the invoker
yarn-link-log-message=true //If true, display a link to YARN in the static log message, otherwise do not include a link to YARN.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -479,10 +479,6 @@ object LoggingMarkers {
LogMarkerToken(invoker, "runc", start, Some(cmd), Map("cmd" -> cmd))(MeasurementUnit.time.milliseconds)
def INVOKER_KUBEAPI_CMD(cmd: String) =
LogMarkerToken(invoker, "kubeapi", start, Some(cmd), Map("cmd" -> cmd))(MeasurementUnit.none)
def INVOKER_MESOS_CMD(cmd: String) =
LogMarkerToken(invoker, "mesos", start, Some(cmd), Map("cmd" -> cmd))(MeasurementUnit.time.milliseconds)
def INVOKER_MESOS_CMD_TIMEOUT(cmd: String) =
LogMarkerToken(invoker, "mesos", timeout, Some(cmd), Map("cmd" -> cmd))(MeasurementUnit.none)
def INVOKER_CONTAINER_START(containerState: String, invocationNamespace: String, namespace: String, action: String) =
LogMarkerToken(
invoker,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@ object ConfigKeys {
val splunk = s"$logStore.splunk"
val logStoreElasticSearch = s"$logStore.elasticsearch"

val mesos = "whisk.mesos"
val yarn = "whisk.yarn"

val containerProxy = "whisk.container-proxy"
Expand Down