Skip to content
GitLab
Unverified Commit e6b34326 authored by AMIT KUMAR's avatar AMIT KUMAR Committed by GitHub
Browse files

Issue #SB-0000 feat:fixed actor config (#961) 

* Issue #SB-0000 feat:fixed actor config

* Issue #SB-0000 feat:fixed actor config
parent 2931afdd
release-4.3.0 release-4.3.0_RC16 release-4.3.0_RC15 release-4.3.0_RC14
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 254 additions and 29 deletions
+254 -29
controller/conf/application.conf
+ 241
− 25
View file @ e6b34326
......@@ -97,8 +97,8 @@ akka {
executor = "fork-join-executor"
fork-join-executor {
parallelism-min = 8
parallelism-factor = 8.0
parallelism-max = 32
parallelism-factor = 32.0
parallelism-max = 64
}
# Throughput for default Dispatcher, set to 1 for as fair as possible
throughput = 1
......@@ -110,107 +110,179 @@ akka {
nr-of-instances = 5
dispatcher = brr-usr-dispatcher
}
"/background_job_manager_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/user_role_background_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 5
dispatcher = brr-usr-dispatcher
}
"/user_role_background_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/org_background_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 5
dispatcher = brr-usr-dispatcher
}
"/org_background_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/es_sync_background_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 15
dispatcher = brr-usr-dispatcher
}
"/es_sync_background_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/email_service_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 5
dispatcher = notification-dispatcher
}
"/email_service_actor/*"
{
dispatcher = akka.actor.notification-dispatcher
}
"/user_profile_read_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 15
nr-of-instances = 20
dispatcher = most-used-one-dispatcher
}
"/user_profile_read_actor/*"
{
dispatcher = akka.actor.most-used-one-dispatcher
}
"/check_user_exist_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 10
nr-of-instances = 15
dispatcher = most-used-one-dispatcher
}
"/check_user_exist_actor/*"
{
dispatcher = akka.actor.most-used-one-dispatcher
}
"/user_type_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 2
dispatcher = rr-usr-dispatcher
dispatcher = brr-usr-dispatcher
}
"/user_type_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/user_status_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 2
dispatcher = rr-usr-dispatcher
dispatcher = brr-usr-dispatcher
}
"/user_status_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/user_role_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 5
nr-of-instances = 10
dispatcher = most-used-two-dispatcher
}
"/user_role_actor/*"
{
dispatcher = akka.actor.most-used-two-dispatcher
}
"/fetch_user_role_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 20
dispatcher = most-used-two-dispatcher
}
"/fetch_user_role_actor/*"
{
dispatcher = akka.actor.most-used-two-dispatcher
}
"/user_external_identity_management_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 5
dispatcher = rr-usr-dispatcher
}
"/user_external_identity_management_actor/*"
{
dispatcher = akka.actor.rr-usr-dispatcher
}
"/user_self_declaration_management_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 2
dispatcher = rr-usr-dispatcher
}
"/user_self_declaration_management_actor/*"
{
dispatcher = akka.actor.rr-usr-dispatcher
}
"/user_org_management_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 5
dispatcher = rr-usr-dispatcher
}
"/user_org_management_actor/*"
{
dispatcher = akka.actor.rr-usr-dispatcher
}
"/user_on_boarding_notification_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 2
dispatcher = rr-usr-dispatcher
dispatcher = brr-usr-dispatcher
}
"/user_on_boarding_notification_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/user_background_job_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 15
nr-of-instances = 5
dispatcher = most-used-two-dispatcher
}
"/user_background_job_actor/*"
{
dispatcher = akka.actor.most-used-two-dispatcher
}
"/user_profile_update_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 5
nr-of-instances = 15
dispatcher = most-used-two-dispatcher
}
"/user_profile_update_actor/*"
{
dispatcher = akka.actor.most-used-two-dispatcher
}
"/user_login_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 2
dispatcher = rr-usr-dispatcher
dispatcher = brr-usr-dispatcher
}
"/user_login_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/org_management_actor"
{
......@@ -218,17 +290,29 @@ akka {
nr-of-instances = 5
dispatcher = rr-usr-dispatcher
}
"/org_management_actor/*"
{
dispatcher = akka.actor.rr-usr-dispatcher
}
"/search_handler_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 25
dispatcher = most-used-one-dispatcher
}
"/search_handler_actor/*"
{
dispatcher = akka.actor.most-used-one-dispatcher
}
"/bulk_upload_management_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 1
dispatcher = rr-usr-dispatcher
dispatcher = brr-usr-dispatcher
}
"/bulk_upload_management_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/es_sync_actor"
{
......@@ -236,17 +320,29 @@ akka {
nr-of-instances = 15
dispatcher = rr-usr-dispatcher
}
"/es_sync_actor/*"
{
dispatcher = akka.actor.rr-usr-dispatcher
}
"/file_upload_service_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 1
dispatcher = rr-usr-dispatcher
dispatcher = brr-usr-dispatcher
}
"/file_upload_service_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/notes_management_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 1
dispatcher = rr-usr-dispatcher
dispatcher = brr-usr-dispatcher
}
"/notes_management_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/tenant_preference_actor"
{
......@@ -254,41 +350,69 @@ akka {
nr-of-instances = 1
dispatcher = rr-usr-dispatcher
}
"/tenant_preference_actor/*"
{
dispatcher = akka.actor.rr-usr-dispatcher
}
"/health_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 5
dispatcher = health-check-dispatcher
}
"/health_actor/*"
{
dispatcher = akka.actor.health-check-dispatcher
}
"/location_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 5
dispatcher = rr-usr-dispatcher
}
"/location_actor/*"
{
dispatcher = akka.actor.rr-usr-dispatcher
}
"/location_background_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 5
dispatcher = brr-usr-dispatcher
}
"/location_background_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/location_bulk_upload_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 2
dispatcher = rr-usr-dispatcher
dispatcher = brr-usr-dispatcher
}
"/location_bulk_upload_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/org_bulk_upload_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 2
dispatcher = rr-usr-dispatcher
dispatcher = brr-usr-dispatcher
}
"/org_bulk_upload_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/user_bulk_upload_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 2
dispatcher = rr-usr-dispatcher
dispatcher = brr-usr-dispatcher
}
"/user_bulk_upload_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/system_settings_actor"
{
......@@ -296,47 +420,79 @@ akka {
nr-of-instances = 15
dispatcher = most-used-two-dispatcher
}
"/system_settings_actor/*"
{
dispatcher = akka.actor.most-used-two-dispatcher
}
"/user_tnc_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 15
dispatcher = most-used-two-dispatcher
}
"/user_tnc_actor/*"
{
dispatcher = akka.actor.most-used-two-dispatcher
}
"/location_bulk_upload_background_job_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 2
dispatcher = brr-usr-dispatcher
}
"/location_bulk_upload_background_job_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/org_bulk_upload_background_job_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 2
dispatcher = brr-usr-dispatcher
}
"/org_bulk_upload_background_job_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/user_bulk_upload_background_job_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 2
dispatcher = brr-usr-dispatcher
}
"/user_bulk_upload_background_job_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/otp_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 10
nr-of-instances = 15
dispatcher = notification-dispatcher
}
"/otp_actor/*"
{
dispatcher = akka.actor.notification-dispatcher
}
"/send_otp_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 5
nr-of-instances = 15
dispatcher = notification-dispatcher
}
"/send_otp_actor/*"
{
dispatcher = akka.actor.notification-dispatcher
}
"/tenant_migration_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 3
dispatcher = rr-usr-dispatcher
dispatcher = brr-usr-dispatcher
}
"/tenant_migration_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/identifier_free_up_actor"
{
......@@ -344,90 +500,150 @@ akka {
nr-of-instances = 15
dispatcher = most-used-two-dispatcher
}
"/identifier_free_up_actor/*"
{
dispatcher = akka.actor.most-used-two-dispatcher
}
"/reset_password_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 15
dispatcher = most-used-one-dispatcher
}
"/reset_password_actor/*"
{
dispatcher = akka.actor.most-used-one-dispatcher
}
"/user_merge_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 2
dispatcher = rr-usr-dispatcher
dispatcher = brr-usr-dispatcher
}
"/user_merge_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/user_feed_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 15
nr-of-instances = 20
dispatcher = most-used-two-dispatcher
}
"/user_feed_actor/*"
{
dispatcher = akka.actor.most-used-two-dispatcher
}
"/search_telemetry_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 2
dispatcher = brr-usr-dispatcher
}
"/search_telemetry_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/user_telemetry_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 2
dispatcher = brr-usr-dispatcher
}
"/user_telemetry_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/send_notification_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 10
dispatcher = notification-dispatcher
}
"/send_notification_actor/*"
{
dispatcher = akka.actor.notification-dispatcher
}
"/background_notification_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 10
dispatcher = notification-dispatcher
}
"/background_notification_actor/*"
{
dispatcher = akka.actor.notification-dispatcher
}
"/tenant_migration_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 3
dispatcher = brr-usr-dispatcher
}
"/tenant_migration_actor/*"
{
dispatcher = akka.actor.brr-usr-dispatcher
}
"/user_consent_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 3
dispatcher = rr-usr-dispatcher
}
"/user_consent_actor/*"
{
dispatcher = akka.actor.rr-usr-dispatcher
}
"/user_lookup_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 25
dispatcher = most-used-one-dispatcher
}
"/user_lookup_actor/*"
{
dispatcher = akka.actor.most-used-one-dispatcher
}
"/user_update_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 20
dispatcher = most-used-one-dispatcher
}
"/user_update_actor/*"
{
dispatcher = akka.actor.most-used-one-dispatcher
}
"/managed_user_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 5
dispatcher = most-used-one-dispatcher
}
"/managed_user_actor/*"
{
dispatcher = akka.actor.most-used-one-dispatcher
}
"/ssu_user_create_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 10
nr-of-instances = 15
dispatcher = most-used-one-dispatcher
}
"/ssu_user_create_actor/*"
{
dispatcher = akka.actor.most-used-one-dispatcher
}
"/sso_user_create_actor"
{
router = smallest-mailbox-pool
nr-of-instances = 10
nr-of-instances = 15
dispatcher = most-used-one-dispatcher
}
"/sso_user_create_actor/*"
{
dispatcher = akka.actor.most-used-one-dispatcher
}
}
}
}
......@@ -510,7 +726,7 @@ play.server {
## WS (HTTP Client)
# ~~~~~
libraryDependencies += javaWs
libraryDependencies += javaWs
## Cache
# https://www.playframework.com/documentation/latest/JavaCache
......
core/actor-core/src/main/java/org/sunbird/actor/core/BaseActor.java
+ 10
− 1
View file @ e6b34326
......@@ -16,8 +16,17 @@ public abstract class BaseActor extends UntypedAbstractActor {
if (message instanceof Request) {
Request request = (Request) message;
String operation = request.getOperation();
logger.debug(request.getRequestContext(), "onReceive called for operation: " + operation);
try {
logger.info(
request.getRequestContext(),
"Actor Info: Dispatcher : "
+ context().dispatcher().toString()
+ " , Parent Actor : "
+ context().parent().toString()
+ " , Self Actor : "
+ context().self().toString()
+ " , called for operation: "
+ operation);
onReceive(request);
} catch (Exception e) {
logger.error(
......
service/src/main/java/org/sunbird/service/user/impl/UserRoleServiceImpl.java
+ 3
− 3
View file @ e6b34326
......@@ -23,10 +23,10 @@ import org.sunbird.service.user.UserRoleService;
import org.sunbird.util.ProjectUtil;
public class UserRoleServiceImpl implements UserRoleService {
private LoggerUtil logger = new LoggerUtil(UserRoleServiceImpl.class);
private final LoggerUtil logger = new LoggerUtil(UserRoleServiceImpl.class);
private static UserRoleService userRoleService = null;
private ObjectMapper mapper = new ObjectMapper();
private UserRoleDao userRoleDao = UserRoleDaoImpl.getInstance();
private final ObjectMapper mapper = new ObjectMapper();
private final UserRoleDao userRoleDao = UserRoleDaoImpl.getInstance();
public static UserRoleService getInstance() {
if (userRoleService == null) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment