You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2015/11/12 22:20:17 UTC
[6/7] usergrid git commit: Address fixes found during review
Address fixes found during review
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f840623d
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f840623d
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/f840623d
Branch: refs/heads/2.1-release
Commit: f840623df82131429cfd564e0ad4fdeac356a93d
Parents: 7725d90
Author: Todd Nine <tn...@apigee.com>
Authored: Thu Nov 12 11:59:53 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Thu Nov 12 11:59:53 2015 -0700
----------------------------------------------------------------------
.../usergrid/corepersistence/CoreModule.java | 6 +++---
.../service/ServiceSchedulerFig.java | 22 ++++++++++++++++++--
.../usergrid/services/AbstractService.java | 2 +-
3 files changed, 24 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/f840623d/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
index 650bb4d..5d2d8dc 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java
@@ -240,10 +240,10 @@ public class CoreModule extends AbstractModule {
@Inject
@ResponseImportTasks
@Singleton
- public RxTaskScheduler getImportRepairScheduler( final AsyncEventsSchedulerFig asyncEventsSchedulerFig ) {
+ public RxTaskScheduler getImportRepairScheduler( final ServiceSchedulerFig serviceSchedulerFig ) {
- final String poolName = asyncEventsSchedulerFig.getImportSchedulerName();
- final int threadCount = asyncEventsSchedulerFig.getMaxImportThreads();
+ final String poolName = serviceSchedulerFig.getRepairPoolName();
+ final int threadCount = serviceSchedulerFig.getImportThreadPoolSize();
final ThreadPoolExecutor executor = TaskExecutorFactory
http://git-wip-us.apache.org/repos/asf/usergrid/blob/f840623d/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ServiceSchedulerFig.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ServiceSchedulerFig.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ServiceSchedulerFig.java
index ddaa01c..e585ee3 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ServiceSchedulerFig.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/service/ServiceSchedulerFig.java
@@ -37,10 +37,28 @@ public interface ServiceSchedulerFig extends GuicyFig {
String SERVICE_IMPORT_THREADS = "service.import.threads";
+ String SERVICE_IMPORT_POOL_NAME = "service.import.name";
- @Default("20")
+ String SERVICE_IMPORT_CONCURRENCY = "service.import.concurrency";
+
+
+
+
+ @Default( "Usergrid-Import-Pool" )
+ @Key( SERVICE_IMPORT_POOL_NAME )
+ String getRepairPoolName();
+
+
+
+ @Default("100")
@Key( SERVICE_IMPORT_THREADS)
- int getImportThreads();
+ int getImportThreadPoolSize();
+
+
+
+ @Default("20")
+ @Key( SERVICE_IMPORT_CONCURRENCY)
+ int getImportConcurrency();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/f840623d/stack/services/src/main/java/org/apache/usergrid/services/AbstractService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/AbstractService.java b/stack/services/src/main/java/org/apache/usergrid/services/AbstractService.java
index 85c973e..3887f92 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/AbstractService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/AbstractService.java
@@ -488,7 +488,7 @@ public abstract class AbstractService implements Service {
throw new RuntimeException(e);
}
}).subscribeOn(rxScheduler);
- }, rxSchedulerFig.getImportThreads());
+ }, rxSchedulerFig.getImportConcurrency());
ObservableTimer.time(tuplesObservable, entitiesParallelGetTimer).toBlocking().lastOrDefault(null);
}