Added transactions statistics for BI Broker.

Added implementation of gathering transaction statistics when binding independent broker is used.

Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
Change-Id: Ia7fb9374575be62bb6bd6b2ace3112d28524bde5

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/statistics/DataBrokerRuntimeMXBeanImpl.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/statistics/DataBrokerRuntimeMXBeanImpl.java
index a1a24ebc8a55447a96ca8368320b8156bded9c68..5da084e9bd6b68823d35adccc82e86d8008d1a37 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/statistics/DataBrokerRuntimeMXBeanImpl.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/statistics/DataBrokerRuntimeMXBeanImpl.java
@@ -1,14 +1,15 @@
 package org.opendaylight.controller.config.yang.md.sal.binding.statistics;\r
 \r
+import org.opendaylight.controller.config.yang.md.sal.binding.impl.Data;\r
 import org.opendaylight.controller.config.yang.md.sal.binding.impl.DataBrokerImplRuntimeMXBean;\r
 import org.opendaylight.controller.config.yang.md.sal.binding.impl.Transactions;\r
 import org.opendaylight.controller.sal.binding.impl.DataBrokerImpl;\r
 \r
 public class DataBrokerRuntimeMXBeanImpl extends DataBrokerImpl implements DataBrokerImplRuntimeMXBean {\r
     \r
-    private Transactions transactions = new Transactions();\r
+    private final Transactions transactions = new Transactions();\r
+    private final Data data = new Data();\r
     \r
-    @Override\r
     public Transactions getTransactions() {\r
         transactions.setCreated(getCreatedTransactionsCount().get());\r
         transactions.setSubmitted(getSubmittedTransactionsCount().get());\r
@@ -16,4 +17,14 @@ public class DataBrokerRuntimeMXBeanImpl extends DataBrokerImpl implements DataB
         transactions.setFailed(getFailedTransactionsCount().get());\r
         return transactions;\r
     }\r
+\r
+    @Override\r
+    public Data getData() {\r
+        transactions.setCreated(getCreatedTransactionsCount().get());\r
+        transactions.setSubmitted(getSubmittedTransactionsCount().get());\r
+        transactions.setSuccessful(getFinishedTransactionsCount().get());\r
+        transactions.setFailed(getFailedTransactionsCount().get());\r
+        data.setTransactions(transactions);\r
+        return data;\r
+    }\r
 }\r

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/yang/opendaylight-binding-broker-impl.yang b/opendaylight/md-sal/sal-binding-broker/src/main/yang/opendaylight-binding-broker-impl.yang
index 9da073f71b44545694350d17c15f588ea2c36af3..b040aa025e2bd05450f5458922df34f85c46fa30 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/yang/opendaylight-binding-broker-impl.yang
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/yang/opendaylight-binding-broker-impl.yang
@@ -121,7 +121,9 @@ module opendaylight-sal-binding-broker-impl {
     augment "/config:modules/config:module/config:state" {
         case binding-data-broker {
             when "/config:modules/config:module/config:type = 'binding-data-broker'";
-            uses common:data-state;
+            container data {
+                uses common:data-state;
+            }
         }
     }
     augment "/config:modules/config:module/config:state" {

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java
index 050966faa0496a81715388352c0ccefb38fe3567..9a2a90445e0ad1f72d37fc11b4308b0a74452ae8 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java
@@ -9,10 +9,12 @@
 */
 package org.opendaylight.controller.config.yang.md.sal.dom.impl;
 
+import org.opendaylight.controller.config.yang.md.sal.dom.statistics.DomBrokerRuntimeMXBeanImpl;
 import org.opendaylight.controller.sal.core.api.data.DataStore;
 import org.opendaylight.controller.sal.dom.broker.BrokerConfigActivator;
 import org.opendaylight.controller.sal.dom.broker.BrokerImpl;
 import org.osgi.framework.BundleContext;
+
 import static com.google.common.base.Preconditions.*;
 
 /**
@@ -37,14 +39,15 @@ public final class DomBrokerImplModule extends org.opendaylight.controller.confi
         checkArgument(getDataStore() != null, "Data Store needs to be provided for DomBroker");
     }
     
-    
-
     @Override
     public java.lang.AutoCloseable createInstance() {
-        BrokerImpl broker = new BrokerImpl();
-        BrokerConfigActivator activator = new BrokerConfigActivator();
-        DataStore store = getDataStoreDependency();
-        activator.start(broker, store,getBundleContext());
+        final BrokerImpl broker = new BrokerImpl();
+        final BrokerConfigActivator activator = new BrokerConfigActivator();
+        final DataStore store = getDataStoreDependency();
+        activator.start(broker, store, getBundleContext());
+        
+        final DomBrokerImplRuntimeMXBean domBrokerRuntimeMXBean = new DomBrokerRuntimeMXBeanImpl(activator.getDataService());
+        getRootRuntimeBeanRegistratorWrapper().register(domBrokerRuntimeMXBean);
         return broker;
     }
 

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/statistics/DomBrokerRuntimeMXBeanImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/statistics/DomBrokerRuntimeMXBeanImpl.java
new file mode 100644 (file)
index 0000000..bc13979
--- /dev/null
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/statistics/DomBrokerRuntimeMXBeanImpl.java
@@ -0,0 +1,36 @@
+package org.opendaylight.controller.config.yang.md.sal.dom.statistics;
+
+import org.opendaylight.controller.config.yang.md.sal.dom.impl.Data;
+import org.opendaylight.controller.config.yang.md.sal.dom.impl.DomBrokerImplRuntimeMXBean;
+import org.opendaylight.controller.config.yang.md.sal.dom.impl.Transactions;
+import org.opendaylight.controller.sal.dom.broker.DataBrokerImpl;
+
+public class DomBrokerRuntimeMXBeanImpl implements
+        DomBrokerImplRuntimeMXBean {
+    
+    private final DataBrokerImpl dataService;
+    private final Transactions transactions = new Transactions();
+    private final Data data = new Data();
+    
+    public DomBrokerRuntimeMXBeanImpl(DataBrokerImpl dataService) {
+        this.dataService = dataService; 
+    }
+
+    public Transactions getTransactions() {
+        transactions.setCreated(dataService.getCreatedTransactionsCount().get());
+        transactions.setSubmitted(dataService.getSubmittedTransactionsCount().get());
+        transactions.setSuccessful(dataService.getFinishedTransactionsCount().get());
+        transactions.setFailed(dataService.getFailedTransactionsCount().get());
+        return transactions;
+    }
+
+    @Override
+    public Data getData() {
+        transactions.setCreated(dataService.getCreatedTransactionsCount().get());
+        transactions.setSubmitted(dataService.getSubmittedTransactionsCount().get());
+        transactions.setSuccessful(dataService.getFinishedTransactionsCount().get());
+        transactions.setFailed(dataService.getFailedTransactionsCount().get());
+        data.setTransactions(transactions);
+        return data;
+    }
+}

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerConfigActivator.xtend b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerConfigActivator.xtend
index da7cccb156d9ac1437474a01e8cc1260c8ee9bcf..482cfa959f2b8e11ce125a53da97d52b5990a808 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerConfigActivator.xtend
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerConfigActivator.xtend
@@ -19,15 +19,16 @@ class BrokerConfigActivator implements AutoCloseable {
     
     
     private static val ROOT = InstanceIdentifier.builder().toInstance();
+
+    @Property
+    private var DataBrokerImpl dataService;
     
     private var ServiceRegistration<SchemaService> schemaReg;
     private var ServiceRegistration<DataBrokerService> dataReg;
     private var ServiceRegistration<DataProviderService> dataProviderReg;
     private var ServiceRegistration<MountService> mountReg;
     private var ServiceRegistration<MountProvisionService> mountProviderReg;
-    
     private var SchemaServiceImpl schemaService;
-    private var DataBrokerImpl dataService;
     private var MountPointManagerImpl mountService;
     
     SchemaAwareDataStoreAdapter wrappedStore

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/DataBrokerImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/DataBrokerImpl.java
index ac5313a9caa99fdaf4fdb5c29fd7690b08e3589c..56eae97848b71c9556c0eb3108c6d7f92e38b200 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/DataBrokerImpl.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/DataBrokerImpl.java
@@ -2,7 +2,6 @@ package org.opendaylight.controller.sal.dom.broker;
 
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.opendaylight.controller.md.sal.common.api.data.DataChangeEvent;
 import org.opendaylight.controller.md.sal.common.api.data.DataReader;
 import org.opendaylight.controller.md.sal.common.impl.service.AbstractDataBroker;
 import org.opendaylight.controller.sal.common.DataStoreIdentifier;
@@ -15,17 +14,23 @@ import org.opendaylight.yangtools.yang.data.api.CompositeNode;
 import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
 
 public class DataBrokerImpl extends AbstractDataBroker<InstanceIdentifier, CompositeNode, DataChangeListener> implements
-        DataProviderService {
+        DataProviderService, AutoCloseable {
 
+    private AtomicLong nextTransaction = new AtomicLong();
+    private final AtomicLong createdTransactionsCount = new AtomicLong();
+    
     public DataBrokerImpl() {
         setDataReadRouter(new DataReaderRouter());
     }
-
-    private AtomicLong nextTransaction = new AtomicLong();
+    
+    public AtomicLong getCreatedTransactionsCount() {
+        return createdTransactionsCount;
+    }
     
     @Override
     public DataTransactionImpl beginTransaction() {
         String transactionId = "DOM-" + nextTransaction.getAndIncrement();
+        createdTransactionsCount.getAndIncrement();
         return new DataTransactionImpl(transactionId,this);
     }
 
@@ -66,4 +71,9 @@ public class DataBrokerImpl extends AbstractDataBroker<InstanceIdentifier, Compo
         throw new UnsupportedOperationException("Deprecated");
     }
 
+    @Override
+    public void close() throws Exception {
+        
+    }
+
 }
\ No newline at end of file

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/yang/opendaylight-dom-broker-impl.yang b/opendaylight/md-sal/sal-dom-broker/src/main/yang/opendaylight-dom-broker-impl.yang
index bf12ac4f011fc656529b7131027114c67b4e6b31..9ae9c9ce6d4fe65571b4aad1640b3b8782e82930 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/yang/opendaylight-dom-broker-impl.yang
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/yang/opendaylight-dom-broker-impl.yang
@@ -5,6 +5,7 @@ module opendaylight-sal-dom-broker-impl {
 
        import config { prefix config; revision-date 2013-04-05; }
        import opendaylight-md-sal-dom {prefix sal;}
+       import opendaylight-md-sal-common {prefix common;}
 
     description
         "Service definition for Binding Aware MD-SAL.";
@@ -18,7 +19,7 @@ module opendaylight-sal-dom-broker-impl {
         base config:module-type;
         config:provided-service sal:dom-broker-osgi-registry;
         config:java-name-prefix DomBrokerImpl;
-    }
+    }    
     
     identity hash-map-data-store {
         base config:module-type;
@@ -58,4 +59,12 @@ module opendaylight-sal-dom-broker-impl {
         }
     }
     
+    augment "/config:modules/config:module/config:state" {
+        case dom-broker-impl {
+            when "/config:modules/config:module/config:type = 'dom-broker-impl'";
+            container data {
+                uses common:data-state;
+            } 
+        }
+    }
 }
\ No newline at end of file