This is an automated email from the ASF dual-hosted git repository.
rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new a99b0a8 cleanup: remove obsolete mesos configuration (#5144)
a99b0a8 is described below
commit a99b0a8acaeb03a7e65965549bbdd12a9c13e78f
Author: David Grove <[email protected]>
AuthorDate: Tue Jul 27 12:12:31 2021 -0400
cleanup: remove obsolete mesos configuration (#5144)
---
common/scala/src/main/resources/application.conf | 28 ----------------------
.../org/apache/openwhisk/common/Logging.scala | 4 ----
.../org/apache/openwhisk/core/WhiskConfig.scala | 1 -
3 files changed, 33 deletions(-)
diff --git a/common/scala/src/main/resources/application.conf
b/common/scala/src/main/resources/application.conf
index 7600638..ff5f8e2 100644
--- a/common/scala/src/main/resources/application.conf
+++ b/common/scala/src/main/resources/application.conf
@@ -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.
diff --git
a/common/scala/src/main/scala/org/apache/openwhisk/common/Logging.scala
b/common/scala/src/main/scala/org/apache/openwhisk/common/Logging.scala
index 463e3f3..3cc1e51 100644
--- a/common/scala/src/main/scala/org/apache/openwhisk/common/Logging.scala
+++ b/common/scala/src/main/scala/org/apache/openwhisk/common/Logging.scala
@@ -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,
diff --git
a/common/scala/src/main/scala/org/apache/openwhisk/core/WhiskConfig.scala
b/common/scala/src/main/scala/org/apache/openwhisk/core/WhiskConfig.scala
index 33fe9fd..b25b695 100644
--- a/common/scala/src/main/scala/org/apache/openwhisk/core/WhiskConfig.scala
+++ b/common/scala/src/main/scala/org/apache/openwhisk/core/WhiskConfig.scala
@@ -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"
