Fix new scheduler error (#5206)

apache · Apr 5, 2022 · b0a88b5 · b0a88b5
1 parent 829e734
commit b0a88b5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 0 deletions.
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
@@ -478,6 +478,7 @@ watcher:
  eventNotificationDelayMs: "{{ watcher_notification_delay | default('5000 ms') }}"
 
 durationChecker:
+ spi: "{{ duration_checker_spi | default('') }}"
  timeWindow: "{{ duration_checker_time_window | default('1 d') }}"
 
 enable_scheduler: "{{ scheduler_enable | default(false) }}"

diff --git a/ansible/roles/controller/tasks/deploy.yml b/ansible/roles/controller/tasks/deploy.yml
@@ -317,6 +317,8 @@
  "CONFIG_whisk_etcd_pool_threads": "{{ etcd.pool_threads }}"
  "CONFIG_whisk_scheduler_grpc_tls": "{{ scheduler.grpc.tls | default('false') | lower }}"
  "CONFIG_whisk_scheduler_maxPeek": "{{ scheduler.maxPeek }}"
+ "CONFIG_whisk_spi_LoadBalancerProvider": "org.apache.openwhisk.core.loadBalancer.FPCPoolBalancer"
+ "CONFIG_whisk_spi_EntitlementSpiProvider": "org.apache.openwhisk.core.entitlement.FPCEntitlementProvider"
  when: enable_scheduler
 
 - name: merge scheduler env

diff --git a/ansible/roles/invoker/tasks/deploy.yml b/ansible/roles/invoker/tasks/deploy.yml
@@ -336,6 +336,8 @@
  "CONFIG_whisk_etcd_pool_threads": "{{ etcd.pool_threads }}"
  "CONFIG_whisk_scheduler_dataManagementService_retryInterval": "{{ scheduler.dataManagementService.retryInterval }}"
  "CONFIG_whisk_invoker_containerCreation_maxPeek": "{{ invoker.container.creationMaxPeek }}"
+ "CONFIG_whisk_spi_InvokerProvider": "org.apache.openwhisk.core.invoker.FPCInvokerReactive"
+ "CONFIG_whisk_spi_InvokerServerProvider": "org.apache.openwhisk.core.invoker.FPCInvokerServer"
  when: enable_scheduler
 
 - name: merge scheduler env

diff --git a/ansible/roles/schedulers/tasks/deploy.yml b/ansible/roles/schedulers/tasks/deploy.yml
@@ -216,6 +216,8 @@
  "CONFIG_whisk_scheduler_username": "{{ scheduler.username }}"
  "CONFIG_whisk_scheduler_password": "{{ scheduler.password }}"
 
+ "CONFIG_whisk_spi_DurationCheckerProvider": "{{ durationChecker.spi }}"
+
 
 - name: merge extra env variables
  set_fact:
@@ -236,6 +238,7 @@
  "CONFIG_whisk_activationStore_elasticsearch_username": "{{ db.elasticsearch.auth.admin.username }}"
  "CONFIG_whisk_activationStore_elasticsearch_password": "{{ db.elasticsearch.auth.admin.password }}"
  "CONFIG_whisk_spi_ActivationStoreProvider": "org.apache.openwhisk.core.database.elasticsearch.ElasticSearchActivationStoreProvider"
+ "CONFIG_whisk_spi_DurationCheckerProvider": "org.apache.openwhisk.core.scheduler.queue.ElasticSearchDurationCheckerProvider"
  when: db.activation_store.backend == "ElasticSearch"
 
 - name: merge elasticsearch activation store env

diff --git a/common/scala/src/main/resources/reference.conf b/common/scala/src/main/resources/reference.conf
@@ -28,6 +28,7 @@ whisk.spi {
  AuthenticationDirectiveProvider = org.apache.openwhisk.core.controller.BasicAuthenticationDirective
  InvokerProvider = org.apache.openwhisk.core.invoker.InvokerReactive
  InvokerServerProvider = org.apache.openwhisk.core.invoker.DefaultInvokerServer
+ DurationCheckerProvider = org.apache.openwhisk.core.scheduler.queue.NoopDurationCheckerProvider
 }
 
 dispatchers {
@@ -81,4 +82,8 @@ dispatchers {
  # before the thread is returned to the pool. Set to 1 for as fair as possible.
  throughput = 5
  }
+ lease-service-dispatcher {
+ type = PinnedDispatcher
+ executor = "thread-pool-executor"
+ }
 }