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

Fix new scheduler error #5206

Merged
merged 1 commit into from
Apr 5, 2022
Merged

Conversation

jiangpengcheng
Copy link
Contributor

Add some missing configuration for new scheduler

Description

Related issue and scope

  • I opened an issue to propose and discuss this change (#????)

My changes affect the following components

  • API
  • Controller
  • Message Bus (e.g., Kafka)
  • Loadbalancer
  • Scheduler
  • Invoker
  • Intrinsic actions (e.g., sequences, conductors)
  • Data stores (e.g., CouchDB)
  • Tests
  • Deployment
  • CLI
  • General tooling
  • Documentation

Types of changes

  • Bug fix (generally a non-breaking change which closes an issue).
  • Enhancement or new feature (adds new functionality).
  • Breaking change (a bug fix or enhancement which changes existing behavior).

Checklist:

  • I signed an Apache CLA.
  • I reviewed the style guides and followed the recommendations (Travis CI will check :).
  • I added tests to cover my changes.
  • My changes require further changes to the documentation.
  • I updated the documentation where necessary.

@@ -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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently, this is guided to configure them alternatively.
https://github.com/apache/openwhisk/tree/master/ansible#optional-enable-the-new-scheduler

If we take this approach, how about changing the documentation too?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this pr is only useful for ansible way(we may need other prs for k8s and standalone), so I think it's better to keep the document

@codecov-commenter
Copy link

codecov-commenter commented Mar 24, 2022

Codecov Report

Merging #5206 (40ea3da) into master (5332e6d) will increase coverage by 19.76%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           master    #5206       +/-   ##
===========================================
+ Coverage   44.65%   64.41%   +19.76%     
===========================================
  Files         238      238               
  Lines       13937    13937               
  Branches      581      581               
===========================================
+ Hits         6224     8978     +2754     
+ Misses       7713     4959     -2754     
Impacted Files Coverage Δ
...hisk/core/scheduler/message/ContainerMessage.scala 0.00% <0.00%> (-100.00%) ⬇️
.../openwhisk/core/scheduler/FPCSchedulerServer.scala 0.00% <0.00%> (-95.84%) ⬇️
...nwhisk/core/scheduler/queue/ContainerCounter.scala 0.00% <0.00%> (-92.11%) ⬇️
...sk/core/scheduler/container/ContainerManager.scala 0.00% <0.00%> (-88.72%) ⬇️
...e/openwhisk/core/scheduler/queue/MemoryQueue.scala 0.00% <0.00%> (-83.74%) ⬇️
.../core/scheduler/container/CreationJobManager.scala 0.00% <0.00%> (-83.34%) ⬇️
...scheduler/queue/ElasticSearchDurationChecker.scala 0.00% <0.00%> (-80.77%) ⬇️
.../main/scala/org/apache/openwhisk/core/WarmUp.scala 21.42% <0.00%> (-78.58%) ⬇️
...core/scheduler/queue/SchedulingDecisionMaker.scala 0.00% <0.00%> (-73.18%) ⬇️
.../openwhisk/core/scheduler/queue/QueueManager.scala 8.00% <0.00%> (-65.46%) ⬇️
... and 145 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5332e6d...40ea3da. Read the comment docs.

@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Regardless of whether the ansible changes make it in, I think we should merge in the changes to this file so that service can at least run with all of the necessary providers. If you want to put this file's changes in a separate PR I'd approve that. Don't have an opinion on the ansible change

@rabbah rabbah merged commit b0a88b5 into apache:master Apr 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants