Shared system services configurability (ONOS-1304)

Change-Id: I42210128fd973f16bb07955175d8e361858a9034

Shared system services configurability (ONOS-1304)
Change-Id: I42210128fd973f16bb07955175d8e361858a9034
Murat Parlakisik · Gerrit Code Review
Commit 553db17965719b83775e29418884195b55dd6343 553db179 1 parent 6148f36f
Showing 2 changed files with 87 additions and 3 deletions
core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
utils/misc/src/main/java/org/onlab/util/SharedExecutors.java
--- a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
View file @553db17
+++ b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
View file @553db17
@@ -20,21 +20,28 @@ import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Modified;
+import org.onlab.util.SharedExecutors;
 import org.onlab.util.Tools;
+import org.onosproject.cfg.ComponentConfigService;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.ApplicationIdStore;
 import org.onosproject.core.CoreService;
 import org.onosproject.core.IdBlockStore;
 import org.onosproject.core.IdGenerator;
 import org.onosproject.core.Version;
+import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import java.io.File;
+import java.util.Dictionary;
 import java.util.List;
 import java.util.Set;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Strings.isNullOrEmpty;
 /**
  * Core service implementation.
@@ -54,14 +61,27 @@ public class CoreManager implements CoreService {
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected IdBlockStore idBlockStore;
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected ComponentConfigService cfgService;
+
+    @Property(name = "sharedThreadPoolSize", intValue = SharedExecutors.DEFAULT_THREAD_SIZE,
+            label = "Configure shared pool maximum size ")
+    private int sharedThreadPoolSize = SharedExecutors.DEFAULT_THREAD_SIZE;
+
     @Activate
     public void activate() {
+        cfgService.registerProperties(getClass());
         List<String> versionLines = Tools.slurp(VERSION_FILE);
         if (versionLines != null && !versionLines.isEmpty()) {
             version = Version.version(versionLines.get(0));
         }
     }
+    @Deactivate
+    public void deactivate() {
+        cfgService.unregisterProperties(getClass(), false);
+    }
+
     @Override
     public Version version() {
         return version;
@@ -95,4 +115,48 @@ public class CoreManager implements CoreService {
         return new BlockAllocatorBasedIdGenerator(allocator);
     }
+
+    @Modified
+    public void modified(ComponentContext context) {
+        Dictionary<?, ?> properties = context.getProperties();
+        Integer sharedThreadPoolSizeConfig =
+                getIntegerProperty(properties, "sharedThreadPoolSize");
+        if (sharedThreadPoolSizeConfig == null) {
+            log.info("Shared Pool Size is not configured, default value is {}",
+                    sharedThreadPoolSize);
+        } else {
+            if (sharedThreadPoolSizeConfig > 0) {
+                sharedThreadPoolSize = sharedThreadPoolSizeConfig;
+                SharedExecutors.setPoolSize(sharedThreadPoolSize);
+                log.info("Configured. Shared Pool Size is configured to {}",
+                        sharedThreadPoolSize);
+            } else {
+                log.warn("Shared Pool Size size must be greater than 0");
+            }
+        }
+    }
+
+
+
+    /**
+     * Get Integer property from the propertyName
+     * Return null if propertyName is not found.
+     *
+     * @param properties properties to be looked up
+     * @param propertyName the name of the property to look up
+     * @return value when the propertyName is defined or return null
+     */
+    private static Integer getIntegerProperty(Dictionary<?, ?> properties,
+                                              String propertyName) {
+        Integer value = null;
+        try {
+            String s = (String) properties.get(propertyName);
+            value = isNullOrEmpty(s) ? value : Integer.parseInt(s.trim());
+        } catch (NumberFormatException | ClassCastException e) {
+            value = null;
+        }
+        return value;
+    }
+
+
 }
--- a/utils/misc/src/main/java/org/onlab/util/SharedExecutors.java
View file @553db17
+++ b/utils/misc/src/main/java/org/onlab/util/SharedExecutors.java
View file @553db17
@@ -18,6 +18,8 @@ package org.onlab.util;
 import java.util.Timer;
 import java.util.concurrent.ExecutorService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import static java.util.concurrent.Executors.newFixedThreadPool;
 import static java.util.concurrent.Executors.newSingleThreadExecutor;
@@ -34,15 +36,18 @@ import static org.onlab.util.Tools.groupedThreads;
  */
 public final class SharedExecutors {
+    private static final Logger log = LoggerFactory.getLogger(SharedExecutors.class);
+
     // TODO: make this configurable via setPoolSize static method
-    private static int numberOfThreads = 30;
+    public static final int DEFAULT_THREAD_SIZE = 30;
+    private static int poolSize = DEFAULT_THREAD_SIZE;
     private static ExecutorService singleThreadExecutor =
             newSingleThreadExecutor(groupedThreads("onos/shared",
                                                    "onos-single-executor"));
     private static ExecutorService poolThreadExecutor =
-            newFixedThreadPool(numberOfThreads, groupedThreads("onos/shared",
+            newFixedThreadPool(poolSize, groupedThreads("onos/shared",
                                                                "onos-pool-executor-%d"));
     private static Timer sharedTimer = new Timer("onos-shared-timer");
@@ -78,4 +83,19 @@ public final class SharedExecutors {
         return sharedTimer;
     }
+    /**
+     * Sets the shared thread pool size.
+     * @param poolSize
+     */
+    public static void setPoolSize(int poolSize) {
+        if (poolSize > 0) {
+            SharedExecutors.poolSize = poolSize;
+            //TODO: wait for execution previous task in the queue .
+            poolThreadExecutor.shutdown();
+            poolThreadExecutor = newFixedThreadPool(poolSize, groupedThreads("onos/shared",
+                    "onos-pool-executor-%d"));
+        } else {
+            log.warn("Shared Pool Size size must be greater than 0");
+        }
+    }
 }