Skip to content

Commit f3d380b

Browse files
committed
cleanup: remove obsolete mesos configuration
1 parent 4e25ada commit f3d380b

File tree

3 files changed

+0
-33
lines changed

3 files changed

+0
-33
lines changed

common/scala/src/main/resources/application.conf

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -482,34 +482,6 @@ whisk {
482482
default-list-limit = 30 # default limit on number of entities returned from a collection on a list operation
483483
}
484484

485-
mesos {
486-
master-url = "http://localhost:5050" //your mesos master
487-
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)
488-
role = "*" //see http://mesos.apache.org/documentation/latest/roles/#associating-frameworks-with-roles
489-
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.
490-
constraints = [] //placement constraint strings to use for managed containers e.g. ["att1 LIKE v1", "att2 UNLIKE v2"]
491-
blackbox-constraints = [] //placement constraints to use for blackbox containers
492-
constraint-delimiter = " "//used to parse constraint strings
493-
teardown-on-exit = true //set to true to disable the mesos framework on system exit; set for false for HA deployments
494-
offer-refuse-duration = 5 seconds //minimum time until an offer will arrive again at a particular invoker
495-
heartbeat-max-failures = 2 //number of missed heartbeats from mesos master until resubscribe
496-
timeouts {
497-
failover = 0 seconds //Timeout allowed for framework to reconnect after disconnection.
498-
task-launch = 45 seconds //timeout for creating mesos tasks (containers)
499-
task-delete = 30 seconds //timeout for destroying mesos tasks (containers)
500-
subscribe = 10 seconds //timeout for framework subscription handshake
501-
teardown = 30 seconds //timeout for framework teardown
502-
}
503-
health-check {#Remove health-section section to disable healthchecks at action containers
504-
port-index = 0 //should always be port 0 (action container should only listen on 1 port)
505-
delay = 0 seconds //the amount of time (in seconds) to wait until starting checking the task.
506-
interval = 1 seconds //the interval (in seconds) between check attempts.
507-
timeout = 1 seconds //the amount of time (in seconds) to wait for the check to complete
508-
grace-period = 25 seconds //the amount of time after the task is launched during which health check failures are ignored.
509-
max-consecutive-failures = 3 //the number of consecutive failures until the task is killed by the executor.
510-
}
511-
}
512-
513485
yarn {
514486
master-url="http://localhost:8088" //YARN Resource Manager endpoint to be accessed from the invoker
515487
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.

common/scala/src/main/scala/org/apache/openwhisk/common/Logging.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -479,10 +479,6 @@ object LoggingMarkers {
479479
LogMarkerToken(invoker, "runc", start, Some(cmd), Map("cmd" -> cmd))(MeasurementUnit.time.milliseconds)
480480
def INVOKER_KUBEAPI_CMD(cmd: String) =
481481
LogMarkerToken(invoker, "kubeapi", start, Some(cmd), Map("cmd" -> cmd))(MeasurementUnit.none)
482-
def INVOKER_MESOS_CMD(cmd: String) =
483-
LogMarkerToken(invoker, "mesos", start, Some(cmd), Map("cmd" -> cmd))(MeasurementUnit.time.milliseconds)
484-
def INVOKER_MESOS_CMD_TIMEOUT(cmd: String) =
485-
LogMarkerToken(invoker, "mesos", timeout, Some(cmd), Map("cmd" -> cmd))(MeasurementUnit.none)
486482
def INVOKER_CONTAINER_START(containerState: String, invocationNamespace: String, namespace: String, action: String) =
487483
LogMarkerToken(
488484
invoker,

common/scala/src/main/scala/org/apache/openwhisk/core/WhiskConfig.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ object ConfigKeys {
254254
val splunk = s"$logStore.splunk"
255255
val logStoreElasticSearch = s"$logStore.elasticsearch"
256256

257-
val mesos = "whisk.mesos"
258257
val yarn = "whisk.yarn"
259258

260259
val containerProxy = "whisk.container-proxy"

0 commit comments

Comments
 (0)