Skip to content

Commit

Permalink
Rename akka related classes to pekko
Browse files Browse the repository at this point in the history
Signed-off-by: Miguel Guimarães <[email protected]>
  • Loading branch information
hmiguim committed Sep 4, 2024
1 parent 680ce5f commit 8aec720
Show file tree
Hide file tree
Showing 65 changed files with 1,504 additions and 1,160 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -765,10 +765,10 @@ public enum DistributedModeType {
public static final String DEFAULT_ENVIRONMENT_COLLECT_VERSION = "true";

public enum OrchestratorType {
AKKA, AKKA_DISTRIBUTED
PEKKO, PEKKO_DISTRIBUTED
}

public static final OrchestratorType DEFAULT_ORCHESTRATOR_TYPE = OrchestratorType.AKKA;
public static final OrchestratorType DEFAULT_ORCHESTRATOR_TYPE = OrchestratorType.PEKKO;
public static final String ORCHESTRATOR_TYPE_PROPERTY = "core.orchestrator.type";
public static final String CORE_ORCHESTRATOR_PREFIX = "core.orchestrator";
public static final String CORE_ORCHESTRATOR_PROP_INTERNAL_JOBS_PRIORITY = "internal_jobs_priority";
Expand Down Expand Up @@ -830,7 +830,7 @@ public enum OrchestratorType {
"org.roda.core.data.v2.ip.TransferredResource", "org.roda.core.data.v2.user.User",
"org.roda.core.data.v2.user.Group", "org.roda.core.data.v2.user.RODAMember",
"org.roda.core.data.v2.ip.disposal.DisposalConfirmation", "org.roda.core.data.v2.user.RodaPrincipal",
"org.roda.core.data.v2.ip.AIP", "org.roda.core.data.v2.risks.Risk", "org.roda.core.events.akka.CRDTWrapper",
"org.roda.core.data.v2.ip.AIP", "org.roda.core.data.v2.risks.Risk", "org.roda.core.events.pekko.CRDTWrapper",
"org.roda.core.data.v2.ip.DIP", "org.roda.core.data.v2.ip.metadata.DescriptiveMetadata",
"org.roda.core.data.v2.ip.disposal.DisposalConfirmationAIPEntry",
"org.roda.core.data.v2.ip.disposal.aipMetadata.DisposalConfirmationAIPMetadata",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.roda.core.plugins.PluginHelper;
import org.roda.core.plugins.RODAObjectsProcessingLogic;
import org.roda.core.plugins.orchestrate.JobPluginInfo;
import org.roda.core.plugins.orchestrate.akka.AkkaJobsManager;
import org.roda.core.plugins.orchestrate.pekko.PekkoJobsManager;
import org.roda.core.storage.StorageService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -145,7 +145,7 @@ public void process(IndexService index, ModelService model, StorageService stora
Report reportItem = PluginHelper.initPluginReportItem(plugin, aip.getId(), AIP.class);
addDetails(reportItem, new Date().toString());
for (Entry<String, Counter> entry : RodaCoreFactory.getMetrics().getCounters().entrySet()) {
if (entry.getKey().endsWith(AkkaJobsManager.LOCK_REQUESTS_WAITING_TO_ACQUIRE_LOCK)
if (entry.getKey().endsWith(PekkoJobsManager.LOCK_REQUESTS_WAITING_TO_ACQUIRE_LOCK)
&& entry.getValue().getCount() > 0) {
addDetails(reportItem, PLUGIN_DETAILS_AT_LEAST_ONE_LOCK_REQUEST_WAITING);
}
Expand Down
6 changes: 3 additions & 3 deletions roda-core/roda-core-tests/src/main/resources/logback-test.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
</appender>


<!-- <logger name="org.roda.core.plugins.orchestrate.akka" additivity="false"> -->
<!-- <logger name="org.roda.core.plugins.orchestrate.pekko" additivity="false"> -->
<!-- <level value="TRACE" /> -->
<!-- <appender-ref ref="STDOUT" /> -->
<!-- </logger> -->

<logger name="org.roda.core.plugins.orchestrate.akka.AkkaWorkerActor" level="off" additivity="false" />
<logger name="org.roda.core.plugins.orchestrate.pekko.PekkoWorkerActor" level="off" additivity="false" />

<logger name="org.roda.core.plugins.orchestrate.akka.DeadLetterActor" level="off" additivity="false" />
<logger name="org.roda.core.plugins.orchestrate.pekko.DeadLetterActor" level="off" additivity="false" />

<logger name="org.roda" level="info" additivity="false">
<appender-ref ref="STDOUT" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
import org.roda.core.plugins.PluginManager;
import org.roda.core.plugins.PluginManagerException;
import org.roda.core.plugins.PluginOrchestrator;
import org.roda.core.plugins.orchestrate.AkkaEmbeddedPluginOrchestrator;
import org.roda.core.plugins.orchestrate.PekkoEmbeddedPluginOrchestrator;
import org.roda.core.protocols.Protocol;
import org.roda.core.protocols.ProtocolManager;
import org.roda.core.protocols.ProtocolManagerException;
Expand Down Expand Up @@ -1568,8 +1568,8 @@ private static void instantiateDistributedMode() {

private static void instantiateOrchestrator() {
OrchestratorType orchestratorType = getOrchestratorType();
if (orchestratorType == OrchestratorType.AKKA) {
pluginOrchestrator = new AkkaEmbeddedPluginOrchestrator();
if (orchestratorType == OrchestratorType.PEKKO) {
pluginOrchestrator = new PekkoEmbeddedPluginOrchestrator();
} else {
LOGGER.error("Orchestrator type '{}' is invalid or not supported. No plugin orchestrator will be started!",
orchestratorType);
Expand Down
Loading

0 comments on commit 8aec720

Please sign in to comment.