Skip to content

Commit c56f910

Browse files
committed
switch to pekko
Update AmberKryoInitializer.scala scala-kryo-serialization Update build.sbt Update cluster.conf Update cluster.conf Update build.sbt kryo5 Update AmberKryoInitializer.scala Update AmberKryoInitializer.scala Update cluster.conf Update cluster.conf
1 parent ea290c3 commit c56f910

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+116
-110
lines changed

amber/build.sbt

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,23 @@ Compile / unmanagedSourceDirectories += baseDirectory.value / "src" / "main" / "
4949
PB.generate / excludeFilter := "scalapb.proto"
5050

5151
/////////////////////////////////////////////////////////////////////////////
52-
// Akka related
53-
val akkaVersion = "2.6.21"
54-
val akkaDependencies = Seq(
55-
"com.typesafe.akka" %% "akka-actor" % akkaVersion,
56-
"com.typesafe.akka" %% "akka-remote" % akkaVersion,
57-
"com.typesafe.akka" %% "akka-cluster" % akkaVersion,
58-
"com.typesafe.akka" %% "akka-cluster-metrics" % akkaVersion,
59-
"com.typesafe.akka" %% "akka-cluster-tools" % akkaVersion,
60-
"com.typesafe.akka" %% "akka-multi-node-testkit" % akkaVersion % Test,
61-
"com.typesafe.akka" %% "akka-testkit" % akkaVersion % Test,
62-
"com.typesafe.akka" %% "akka-persistence" % akkaVersion,
52+
// Pekko related
53+
val pekkoVersion = "1.2.1"
54+
val pekkoDependencies = Seq(
55+
"org.apache.pekko" %% "pekko-actor" % pekkoVersion,
56+
"org.apache.pekko" %% "pekko-remote" % pekkoVersion,
57+
"org.apache.pekko" %% "pekko-cluster" % pekkoVersion,
58+
"org.apache.pekko" %% "pekko-cluster-metrics" % pekkoVersion,
59+
"org.apache.pekko" %% "pekko-cluster-tools" % pekkoVersion,
60+
"org.apache.pekko" %% "pekko-multi-node-testkit" % pekkoVersion % Test,
61+
"org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test,
62+
"org.apache.pekko" %% "pekko-persistence" % pekkoVersion,
6363
"io.kamon" % "sigar-loader" % "1.6.6-rev002",
64-
"com.softwaremill.macwire" %% "macros" % "2.5.8" % Provided,
65-
"com.softwaremill.macwire" %% "macrosakka" % "2.5.8" % Provided,
66-
"com.softwaremill.macwire" %% "util" % "2.5.8",
67-
"com.softwaremill.macwire" %% "proxy" % "2.5.8",
68-
"com.typesafe.akka" %% "akka-slf4j" % akkaVersion,
64+
"com.softwaremill.macwire" %% "macros" % "2.6.7" % Provided,
65+
"com.softwaremill.macwire" %% "macrospekko" % "2.6.7" % Provided,
66+
"com.softwaremill.macwire" %% "util" % "2.6.7",
67+
"com.softwaremill.macwire" %% "proxy" % "2.6.7",
68+
"org.apache.pekko" %% "pekko-slf4j" % pekkoVersion,
6969
"ch.qos.logback" % "logback-classic" % "1.2.13" % Test
7070
)
7171

@@ -137,7 +137,7 @@ val googleServiceDependencies = Seq(
137137
"com.sun.mail" % "javax.mail" % "1.6.2"
138138
)
139139

140-
libraryDependencies ++= akkaDependencies
140+
libraryDependencies ++= pekkoDependencies
141141
libraryDependencies ++= luceneDependencies
142142
libraryDependencies ++= dropwizardDependencies
143143
libraryDependencies ++= mbknorJacksonJsonSchemaDependencies
@@ -222,8 +222,15 @@ libraryDependencies += "org.jooq" % "jooq" % "3.14.16"
222222
// https://mvnrepository.com/artifact/org.jgrapht/jgrapht-core
223223
libraryDependencies += "org.jgrapht" % "jgrapht-core" % "1.4.0"
224224

225-
// https://mvnrepository.com/artifact/io.altoo/akka-kryo-serialization
226-
libraryDependencies += "io.altoo" %% "akka-kryo-serialization" % "2.5.2"
225+
// https://mvnrepository.com/artifact/com.esotericsoftware/kryo
226+
libraryDependencies += "com.esotericsoftware" % "kryo" % "5.6.2"
227+
libraryDependencies += "com.esotericsoftware" % "kryo5" % "5.6.0"
228+
229+
// https://mvnrepository.com/artifact/io.altoo/pekko-kryo-serialization
230+
libraryDependencies += "io.altoo" %% "pekko-kryo-serialization" % "1.3.0"
231+
232+
// https://mvnrepository.com/artifact/io.altoo/scala-kryo-serialization
233+
libraryDependencies += "io.altoo" %% "scala-kryo-serialization" % "1.3.0"
227234

228235
// https://mvnrepository.com/artifact/com.twitter/util-core
229236
libraryDependencies += "com.twitter" %% "util-core" % "22.12.0"

amber/src/main/scala/org/apache/amber/clustering/ClusterListener.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
package org.apache.amber.clustering
2121

22-
import akka.actor.{Actor, Address}
23-
import akka.cluster.Cluster
24-
import akka.cluster.ClusterEvent._
22+
import org.apache.pekko.actor.{Actor, Address}
23+
import org.apache.pekko.cluster.Cluster
24+
import org.apache.pekko.cluster.ClusterEvent._
2525
import com.google.protobuf.timestamp.Timestamp
2626
import com.twitter.util.{Await, Future}
2727
import org.apache.amber.clustering.ClusterListener.numWorkerNodesInCluster

amber/src/main/scala/org/apache/amber/clustering/SingleNodeListener.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.apache.amber.clustering
2121

22-
import akka.actor.{Actor, ActorLogging}
22+
import org.apache.pekko.actor.{Actor, ActorLogging}
2323
import org.apache.amber.clustering.ClusterListener.GetAvailableNodeAddresses
2424

2525
class SingleNodeListener extends Actor with ActorLogging {

amber/src/main/scala/org/apache/amber/engine/architecture/common/AkkaActorRefMappingService.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.apache.amber.engine.architecture.common
2121

22-
import akka.actor.ActorRef
22+
import org.apache.pekko.actor.ActorRef
2323
import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
2424
import org.apache.amber.engine.architecture.common.WorkflowActor.{
2525
CreditRequest,

amber/src/main/scala/org/apache/amber/engine/architecture/common/AkkaActorService.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919

2020
package org.apache.amber.engine.architecture.common
2121

22-
import akka.actor.{ActorContext, ActorRef, Address, Cancellable, Props}
23-
import akka.util.Timeout
22+
import org.apache.pekko
23+
import pekko.actor.{ActorContext, ActorRef, Address, Cancellable, Props}
24+
import pekko.util.Timeout
2425
import org.apache.amber.core.virtualidentity.ActorVirtualIdentity
2526
import org.apache.amber.engine.common.FutureBijection._
2627

@@ -78,7 +79,7 @@ class AkkaActorService(val id: ActorVirtualIdentity, actorContext: ActorContext)
7879
}
7980

8081
def ask(ref: ActorRef, message: Any): com.twitter.util.Future[Any] = {
81-
akka.pattern.ask(ref, message).asTwitter()
82+
pekko.pattern.ask(ref, message).asTwitter()
8283
}
8384

8485
}

amber/src/main/scala/org/apache/amber/engine/architecture/common/AkkaMessageTransferService.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.apache.amber.engine.architecture.common
2121

22-
import akka.actor.Cancellable
22+
import org.apache.pekko.actor.Cancellable
2323
import org.apache.amber.config.ApplicationConfig
2424
import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
2525
import org.apache.amber.engine.architecture.common.WorkflowActor.NetworkMessage

amber/src/main/scala/org/apache/amber/engine/architecture/common/ExecutorDeployment.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
package org.apache.amber.engine.architecture.common
2121

22-
import akka.actor.{Address, Deploy}
23-
import akka.remote.RemoteScope
22+
import org.apache.pekko.actor.{Address, Deploy}
23+
import org.apache.pekko.remote.RemoteScope
2424
import org.apache.amber.core.workflow.{PhysicalOp, PreferController, RoundRobinPreference}
2525
import org.apache.amber.engine.architecture.controller.execution.OperatorExecution
2626
import org.apache.amber.engine.architecture.deploysemantics.AddressInfo

amber/src/main/scala/org/apache/amber/engine/architecture/common/WorkflowActor.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
package org.apache.amber.engine.architecture.common
2121

22-
import akka.actor.{Actor, ActorRef, Address, Stash}
23-
import akka.pattern.ask
24-
import akka.util.Timeout
22+
import org.apache.pekko.actor.{Actor, ActorRef, Address, Stash}
23+
import org.apache.pekko.pattern.ask
24+
import org.apache.pekko.util.Timeout
2525
import org.apache.amber.clustering.ClusterListener.GetAvailableNodeAddresses
2626
import org.apache.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
2727
import org.apache.amber.engine.architecture.common.WorkflowActor._

amber/src/main/scala/org/apache/amber/engine/architecture/controller/Controller.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
package org.apache.amber.engine.architecture.controller
2121

22-
import akka.actor.SupervisorStrategy.Stop
23-
import akka.actor.{AllForOneStrategy, Props, SupervisorStrategy}
22+
import org.apache.pekko.actor.SupervisorStrategy.Stop
23+
import org.apache.pekko.actor.{AllForOneStrategy, Props, SupervisorStrategy}
2424
import org.apache.texera.web.model.websocket.response.RegionUpdateEvent
2525
import org.apache.amber.config.ApplicationConfig
2626
import org.apache.amber.core.virtualidentity.ChannelIdentity

amber/src/main/scala/org/apache/amber/engine/architecture/controller/ControllerTimerService.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.apache.amber.engine.architecture.controller
2121

22-
import akka.actor.Cancellable
22+
import org.apache.pekko.actor.Cancellable
2323
import org.apache.amber.engine.architecture.common.AkkaActorService
2424
import org.apache.amber.engine.architecture.rpc.controlcommands.{
2525
AsyncRPCContext,

0 commit comments

Comments
 (0)