8000 Fix build error by ningyougang · Pull Request #5123 · apache/openwhisk · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix build error #5123

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

Merged
merged 1 commit into from
Jun 8, 2021
Merged

Conversation

ningyougang
Copy link
Contributor
@ningyougang ningyougang commented Jun 7, 2021

Description

Fix build error, and the error is leaded by this pr: Upgrade to Akka 2.6.12: #5065
When i tested, forgot to rebase that pr.

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.

@ddragosd
Copy link
Contributor
ddragosd commented Jun 7, 2021

@ningyougang thanks !

@ningyougang
Copy link
Contributor Author

@ningyougang thanks !

You are welcome.

@@ -715,7 +714,7 @@ class FunctionPullingContainerProxy(
logging.info(
this,
s"This is the remaining container for ${data.action}. The container will stop after $warmedContainerKeepingTimeout.")
setTimer(KeepingTimeoutName, Remove, warmedContainerKeepingTimeout)
startSingleTimer(KeepingTimeoutName, Remove, warmedContainerKeepingTimeout)
Copy link
Contributor

Choose a reason for hiding this comment

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

startTimerAtFixedRate instead ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I checked the source code

  def startTimerAtFixedRate(name: String, msg: Any, interval: FiniteDuration): Unit =
    startTimer(name, msg, interval, FixedRateMode)

  ...
  /** INTERNAL API */
  @InternalApi
  private[akka] case object FixedRateMode extends TimerMode {
    override def repeat: Boolean = true
  }

the method: startTimerAtFixedRate will invoke startTimer with repeat: true,
but for here, it is a one time timer,
So startSingleTimer is ok here.

@@ -777,7 +776,7 @@ class FunctionPullingContainerProxy(
}
}
unstashAll()
case _ -> Paused => setTimer(IdleTimeoutName, StateTimeout, idleTimeout)
case _ -> Paused => startSingleTimer(IdleTimeoutName, StateTimeout, idleTimeout)
Copy link
Contributor

Choose a reason for hiding this comment

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

startTimerAtFixedRate instead ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@@ -613,7 +612,7 @@ class FunctionPullingContainerProxy(
logging.info(
this,
s"Remain running activations ${runningActivations.keySet().toString()} when received ClientClosed")
setTimer(RunningActivationTimeoutName, ClientClosed, runningActivationTimeout)
startSingleTimer(RunningActivationTimeoutName, ClientClosed, runningActivationTimeout)
Copy link
Contributor

Choose a reason for hiding this comment

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

wondering if startTimerAtFixedRate​ should be used instead

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@codecov-commenter
Copy link
codecov-commenter commented Jun 7, 2021

Codecov Report

Merging #5123 (307a1b3) into master (ecb2a98) will increase coverage by 1.00%.
The diff coverage is 10.02%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5123      +/-   ##
==========================================
+ Coverage   28.91%   29.91%   +1.00%     
==========================================
  Files         219      228       +9     
  Lines       11775    12246     +471     
  Branches      506      519      +13     
==========================================
+ Hits         3405     3664     +259     
- Misses       8370     8582     +212     
Impacted Files Coverage Δ
...la/org/apache/openwhisk/common/TransactionId.scala 91.01% <0.00%> (-1.04%) ⬇️
...rpool/logging/DockerToActivationFileLogStore.scala 0.00% <0.00%> (ø)
.../containerpool/logging/ElasticSearchLogStore.scala 0.00% <ø> (ø)
...sk/core/containerpool/logging/SplunkLogStore.scala 0.00% <0.00%> (ø)
...penwhisk/core/database/ActivationFileStorage.scala 0.00% <0.00%> (ø)
...ache/openwhisk/core/database/ActivationStore.scala 92.30% <ø> (ø)
...nwhisk/core/database/ArtifactActivationStore.scala 0.00% <0.00%> (ø)
...penwhisk/core/database/ArtifactStoreProvider.scala 66.66% <ø> (ø)
...abase/ArtifactWithFileStorageActivationStore.scala 0.00% <0.00%> (ø)
...he/openwhisk/core/database/AttachmentSupport.scala 73.68% <ø> (ø)
... and 65 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 99fb2c5...307a1b3. Read the comment docs.

Copy link
Member
@rabbah rabbah left a comment

Choose a reason for hiding this comment

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

lgtm

@jiangpengcheng jiangpengcheng merged commit e65f899 into apache:master Jun 8, 2021
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
0