controller.git
8 years agoBug 1861 - Adding the missing moxy related bundles to the NSF feature that resulted... 49/11149/1
Madhu Venugopal [Sun, 14 Sep 2014 05:12:27 +0000 (22:12 -0700)]
Bug 1861 - Adding the missing moxy related bundles to the NSF feature that resulted in Neutron Northbound API failures

Change-Id: I8a8947234aab013ff2bcf2e9ae74f2635f2298ac
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
8 years agoMerge changes I9b32ab30,Iebe4701f
Tony Tkacik [Sat, 13 Sep 2014 12:46:44 +0000 (12:46 +0000)]
Merge changes I9b32ab30,Iebe4701f

* changes:
  BUG-650: speed CommitCoordinationTask up
  BUG-650: improve transaction chaining performance

8 years agoMerge "Created Benchmark for InMemoryDataStore Write Op"
Tony Tkacik [Sat, 13 Sep 2014 10:31:15 +0000 (10:31 +0000)]
Merge "Created Benchmark for InMemoryDataStore Write Op"

8 years agoBUG-650: speed CommitCoordinationTask up 23/11123/2
Robert Varga [Fri, 12 Sep 2014 20:47:52 +0000 (22:47 +0200)]
BUG-650: speed CommitCoordinationTask up

Eliminates synchronized block in favor of a compare-and-swap -- the
logic was doing precisely that anyway.

Change-Id: I9b32ab303eb718e8a0af52526857eead65c2b697
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-650: SnapshotBackedWriteTransaction performance 21/11121/2
Robert Varga [Fri, 12 Sep 2014 16:59:24 +0000 (18:59 +0200)]
BUG-650: SnapshotBackedWriteTransaction performance

Remove synchronized block from ready() and cleanup exposed interfaces,
adding some task which need to be fixed still.

Change-Id: Ib1c25819eca60d393a742ab3ebfec6083fe9745d
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-650: improve transaction chaining performance 22/11122/2
Robert Varga [Fri, 12 Sep 2014 18:21:53 +0000 (20:21 +0200)]
BUG-650: improve transaction chaining performance

Transaction chaining has mucked inside SnapshotBackedWriteTransaction to
get its state everytime a new transaction was allocated. Instead we
expose proper lifecycle hooks, so the chain handling logic can keep
track of state itself.

As an added feature, this fixes a bug, where a chain would become
unusable if the user closed a write transaction without actually calling
ready() on it.

Finally it fixes a synchronization bug, where a commit task would not be
properly synchronized with listener registrations.

Change-Id: Iebe4701f1712a95a9316ea8380fe12c8c5fe6b89
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-650: speedup DOMDataBrokerTransactionChainImpl 05/11105/3
Robert Varga [Fri, 12 Sep 2014 13:29:09 +0000 (15:29 +0200)]
BUG-650: speedup DOMDataBrokerTransactionChainImpl

The transaction chain implementation does not need to have
synchronization on submit, but rather it needs to check if the chain has
not been closed (implictly or explicitly). Same goes for the close path,
thus this patch speeds things up by downgrading the synchronized
sections to volatile reads and writes.

Change-Id: I57dec6dbfb1933005a9ee0718b666ee102ce7116
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMerge "bug 1827 XSQL hangs when there is an empty dataset + Add Configuration datastore."
Moiz Raja [Fri, 12 Sep 2014 23:31:57 +0000 (23:31 +0000)]
Merge "bug 1827 XSQL hangs when there is an empty dataset + Add Configuration datastore."

8 years agoBUG-650: optimize DOMDataBrokerImpl chain creation 04/11104/3
Robert Varga [Fri, 12 Sep 2014 12:54:29 +0000 (14:54 +0200)]
BUG-650: optimize DOMDataBrokerImpl chain creation

An EnumMap is better than an immutable map when accessing via the
enumeration value. Also add a check for closed factory.

Change-Id: I208005a2b13c0a16cb594da7c74556f4e9a54e50
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-650: speedup AbstractDOMForwardedTransactionFactory 03/11103/3
Robert Varga [Fri, 12 Sep 2014 12:41:29 +0000 (14:41 +0200)]
BUG-650: speedup AbstractDOMForwardedTransactionFactory

Another speedup -- as it turns out we do not have to take the full lock
to close down the transaction factory. A volatile write is enough to do
that -- which means a volatile read is enough to check for it having
been closed.

Change-Id: I3488ccccc4d91d34665b3ff6e70e047407be48bb
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-650: AbstractDOMForwardedTransactionFactory 02/11102/2
Robert Varga [Fri, 12 Sep 2014 12:31:49 +0000 (14:31 +0200)]
BUG-650: AbstractDOMForwardedTransactionFactory

ImmutableMap is not really what we want to track datastores -- EnumMap
has constant time lookups for everything, plus its use eliminates a
needless builder object allocation.

Change-Id: I0bea628b82d8366bf14532d3bc321067584a84b5
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMerge "Bug 1826: moving clustering test application from integration branch to contro...
Moiz Raja [Fri, 12 Sep 2014 18:20:58 +0000 (18:20 +0000)]
Merge "Bug 1826: moving clustering test application from integration branch to controller"

8 years agoMerge "BUG-650: speedup getSubtransaction()"
Tony Tkacik [Fri, 12 Sep 2014 15:31:24 +0000 (15:31 +0000)]
Merge "BUG-650: speedup getSubtransaction()"

8 years agoMerge "BUG-650: optimize DOMForwardedWriteTransaction"
Tony Tkacik [Fri, 12 Sep 2014 14:12:04 +0000 (14:12 +0000)]
Merge "BUG-650: optimize DOMForwardedWriteTransaction"

8 years agoMerge "BUG-650: cache translated future"
Tony Tkacik [Fri, 12 Sep 2014 14:11:09 +0000 (14:11 +0000)]
Merge "BUG-650: cache translated future"

8 years agoMerge "Fixed Karaf Distribution Archetype add dependent bundles"
Ed Warnicke [Fri, 12 Sep 2014 13:15:51 +0000 (13:15 +0000)]
Merge "Fixed Karaf Distribution Archetype add dependent bundles"

8 years agoBUG-650: speedup getSubtransaction() 01/11101/1
Robert Varga [Fri, 12 Sep 2014 11:20:37 +0000 (13:20 +0200)]
BUG-650: speedup getSubtransaction()

getSubtransaction() is on fast path and it performs two map lookups:
first with containsKey() and then with get(). We know the map cannot
contain null values, so we can perform only the get() and then make
a precondition check on the returned value being non-null.

Change-Id: I477969c8512e3c22e5b7ae5455e0281613a9c752
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-650: optimize DOMForwardedWriteTransaction 00/11100/1
Robert Varga [Fri, 12 Sep 2014 10:05:14 +0000 (12:05 +0200)]
BUG-650: optimize DOMForwardedWriteTransaction

First make sure we get visiblity into cohorts as a collections. This
allows us to optimize allocation of the list where we hold the futures.
We also make it non-immutable -- it is handed off, so there is no reason
to pay the price of an additional allocation.

Second we optimize the transaction state checking by eliminating as
many volatile read/writes as possible. The bottom line is the following:

1) the put/merge/delete paths see only a single volatile read instead of
   two
2) the submit path performs only one volatile get+set and an ordered
   write -- instead of two reads and two writes
3) the cancel path performs a volatile get+set and either an ordered
   write (fast path) or a spin on volatile read (slow path) -- instead of
   a synchronized block, four volatile reads and two volatile writes

Change-Id: I5ec875e65acdee62a4f0daf233617e6af024637f
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-650: cache translated future 99/11099/1
Robert Varga [Fri, 12 Sep 2014 09:42:10 +0000 (11:42 +0200)]
BUG-650: cache translated future

We are instantiating a done future with fixed result -- this is an
invariant, which can readily be shared. do precisely that by retaining a
single global instance.

Change-Id: I0a24adf6f3df4794fda5148c04baed7bbde11c64
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMerge "BUG 1758 - Clustering : CompositeModificationPayload ClassNotFoundException"
Tom Pantelis [Fri, 12 Sep 2014 12:47:20 +0000 (12:47 +0000)]
Merge "BUG 1758 - Clustering : CompositeModificationPayload ClassNotFoundException"

8 years agoMerge "Bug 1348 - TopologyCommitHandler NullPointerException on edgeUpdate CHANGED"
Tony Tkacik [Fri, 12 Sep 2014 11:10:53 +0000 (11:10 +0000)]
Merge "Bug 1348 - TopologyCommitHandler NullPointerException on edgeUpdate CHANGED"

8 years agoMerge "BUG-1521 Unit tests for netconf-util xml package."
Tony Tkacik [Fri, 12 Sep 2014 11:06:50 +0000 (11:06 +0000)]
Merge "BUG-1521 Unit tests for netconf-util xml package."

8 years agoBUG-1521 Unit tests for netconf-util xml package. 32/11032/3
Maros Marsalek [Thu, 11 Sep 2014 10:53:55 +0000 (12:53 +0200)]
BUG-1521 Unit tests for netconf-util xml package.

Change-Id: Iaafba131555b948130a9916127b808c00016f502
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
8 years agoBUG-600 Netconf testtool for scale test, set connection timeout on server side. 96/10996/4
Maros Marsalek [Wed, 10 Sep 2014 13:26:28 +0000 (15:26 +0200)]
BUG-600 Netconf testtool for scale test, set connection timeout on server side.

Change-Id: I21507bce0961dc9b149db6f10b31f34c27188b3a
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
8 years agoMerge "Bug 650: Removed uncessary wrapping and allocation of futures"
Tony Tkacik [Fri, 12 Sep 2014 07:58:31 +0000 (07:58 +0000)]
Merge "Bug 650: Removed uncessary wrapping and allocation of futures"

8 years agoCreated Benchmark for InMemoryDataStore Write Op 48/10948/6
Lukas Sedlak [Tue, 9 Sep 2014 14:35:44 +0000 (16:35 +0200)]
Created Benchmark for InMemoryDataStore Write Op

Created Benchmark suite for testing InMemoryDataStore write operations. The benchmark
is designed to measure efficiency of InMemoryDataStore write operations for scenarios:
 -100K Writes executed as One commit (100K items in one commit) of One outer list item with one inner list item
 -100K Writes executed as Each commit per Write (100K commits) of One outer list item with one inner list item
 -50K Writes executed as One commit (50K items in one commit) of One outer list item with two inner list items
 -50K Writes executed as Each commit per Write (50K commits) of One outer list item with two inner list items
 -10K Writes executed as One commit (10K items in one commit) of One outer list item with ten inner list items
 -10K Writes executed as Each commit per Write (10K commits) of One outer list item with ten inner list items

Benchmark suite contains of three benchmark scenarios where InMemoryDataStore is instantiated with different combinations
of executors. This will allow us to see how executor services has performance impact on DataStore write operations.

The md-sal parent pom is extended with benchmarks profile.

Change-Id: I04f6e4545445d5879d8de9785d7ba1a53ec007af
Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
8 years agoBUG 1758 - Clustering : CompositeModificationPayload ClassNotFoundException 54/10954/4
Moiz Raja [Tue, 9 Sep 2014 16:47:36 +0000 (09:47 -0700)]
BUG 1758 - Clustering : CompositeModificationPayload ClassNotFoundException

This patch also fixes BUG 1753 by enabling the SLF4J Adapter so that logging
goes to the karaf log.

For the most part the fix for CompositeModificationPayload not being found
is because of a DynamicImport missing in sal-akka-raft. I've also moved
Payload and CompositeModificationPayload to sal-clustering-commons

Change-Id: I82f6f598b8c912f8109526ebe7340c70f52fdcde
Signed-off-by: Moiz Raja <moraja@cisco.com>
8 years agoBug 1782 : Removing empty files from codebase 78/11078/2
Harman Singh [Fri, 12 Sep 2014 01:31:36 +0000 (18:31 -0700)]
Bug 1782 : Removing empty files from codebase

Empty files cause sonar to fail and we should not have empty files at first place.

Change-Id: I2d4bcaf26962318851953d078eafc390538057c4
Signed-off-by: Harman Singh <harmasin@cisco.com>
8 years agoBug 1826: moving clustering test application from integration branch to controller 71/11071/4
Basheeruddin Ahmed [Thu, 11 Sep 2014 21:04:42 +0000 (14:04 -0700)]
Bug 1826: moving clustering test application from integration branch to controller

This test application is used by robo test cases for clustering

patch 4:
fixed the overwrite of wrong groupId fix in patch 2
Patch 3:
Basheeruddin just included module-shards.conf and modules.conf for
clustering test app

Change-Id: Iac47e986e36662b1f61e711a194a8c72c8c76a29
Signed-off-by: Harman Singh <harmasin@cisco.com>
Signed-off-by: Basheeruddin Ahmed <syedbahm@cisco.com>
8 years agobug 1827 XSQL hangs when there is an empty dataset + 70/11070/2
Sharon Aicler [Thu, 11 Sep 2014 21:05:11 +0000 (14:05 -0700)]
bug 1827 XSQL hangs when there is an empty dataset +
Add Configuration datastore.

Change-Id: I95a712640d15282e0d4ba3e68b5f315ddb4e83dd
Signed-off-by: Sharon Aicler <saichler@cisco.com>
8 years agoBug 1348 - TopologyCommitHandler NullPointerException on edgeUpdate 50/11050/2
Jan Hajnar [Thu, 11 Sep 2014 13:13:17 +0000 (15:13 +0200)]
Bug 1348 - TopologyCommitHandler NullPointerException on edgeUpdate
CHANGED

* added null check for non-existent edge properties
* added test to test if issue is fixed

Change-Id: I0e2b2f9502be47ac87be5e4213068bcb45295366
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
8 years agoBug 650: Removed uncessary wrapping and allocation of futures 40/11040/3
Robert Varga [Thu, 11 Sep 2014 11:58:32 +0000 (13:58 +0200)]
Bug 650: Removed uncessary wrapping and allocation of futures

There is no need to use an intermediate checkfuture just to communicate
the list over, so let's get rid of the warpping. At the same time we
eliminate lists and opt for arrays. The sizing requirements for arrays
are determined precisely once, when a coordinator is allocated.

Change-Id: Id5c4c7852210b99c4da3e9e77a84c0d2d0fa622d
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMerge "Fixed test which tested incorrect string formating"
Tom Pantelis [Thu, 11 Sep 2014 16:16:12 +0000 (16:16 +0000)]
Merge "Fixed test which tested incorrect string formating"

8 years agoMerge "Bug 1789: Reorder odl-mdsal-clustering feature before odl-restconf"
Ed Warnicke [Thu, 11 Sep 2014 15:46:55 +0000 (15:46 +0000)]
Merge "Bug 1789: Reorder odl-mdsal-clustering feature before odl-restconf"

8 years agoMerge "BUG 1735 Registering a data change listener should be asynchronous"
Tom Pantelis [Thu, 11 Sep 2014 15:41:12 +0000 (15:41 +0000)]
Merge "BUG 1735 Registering a data change listener should be asynchronous"

8 years agoFixed test which tested incorrect string formating 56/11056/1
Tony Tkacik [Thu, 11 Sep 2014 14:45:53 +0000 (16:45 +0200)]
Fixed test which tested incorrect string formating

It turned out, that this test suite tested returned
formated string from YANGTools, which format was not
part of API Contract.

Updated test to test to only for non nulls, which
are parts of API Contract.

Change-Id: I6e33993928667c6e8b4a830b6d0a9c8d10cd4fa2
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoMerge "BUG-1521 Netconf-netty-util missing unit tests"
Tony Tkacik [Thu, 11 Sep 2014 11:57:24 +0000 (11:57 +0000)]
Merge "BUG-1521 Netconf-netty-util missing unit tests"

8 years agoMerge "BUG 1582 - PUT fails validate outer object name"
Tony Tkacik [Thu, 11 Sep 2014 09:54:46 +0000 (09:54 +0000)]
Merge "BUG 1582 - PUT fails validate outer object name"

8 years agoMerge "BUG-1792: share QNames in both cases"
Tony Tkacik [Thu, 11 Sep 2014 09:01:38 +0000 (09:01 +0000)]
Merge "BUG-1792: share QNames in both cases"

8 years agoBUG-1792: share QNames in both cases 07/11007/1
Robert Varga [Wed, 10 Sep 2014 18:12:47 +0000 (20:12 +0200)]
BUG-1792: share QNames in both cases

As it turns out we cached the QNames only in case where the revision was
not present. This adds the misssing call site.

Change-Id: Ic59e1788f85f3f863241b85fd115097a6e3e3e19
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG 1735 Registering a data change listener should be asynchronous 91/10891/6
Moiz Raja [Mon, 8 Sep 2014 00:39:45 +0000 (17:39 -0700)]
BUG 1735 Registering a data change listener should be asynchronous

Change-Id: I1a819976afe6ca44ac811ee30d305fbe76bb8acf
Signed-off-by: Moiz Raja <moraja@cisco.com>
8 years agoMerge "BUG 1734 - Applying a recovered journal to Shard does not happen during recovery"
Tom Pantelis [Wed, 10 Sep 2014 16:54:59 +0000 (16:54 +0000)]
Merge "BUG 1734 - Applying a recovered journal to Shard does not happen during recovery"

8 years agoMerge "BUG 1712 - Distributed DataStore does not work properly with Transaction...
Tom Pantelis [Wed, 10 Sep 2014 16:50:57 +0000 (16:50 +0000)]
Merge "BUG 1712  - Distributed DataStore does not work properly with Transaction Chains"

8 years agoBUG 1734 - Applying a recovered journal to Shard does not happen during recovery 90/10890/5
Moiz Raja [Mon, 8 Sep 2014 00:37:42 +0000 (17:37 -0700)]
BUG 1734 - Applying a recovered journal to Shard does not happen during recovery

This patch applies the state in the journal to the in-memory state immediately
on recovery

Change-Id: I0b97f146d31a38cd103d16cde97aaf1c6ce97b07
Signed-off-by: Moiz Raja <moraja@cisco.com>
8 years agoBUG 1712 - Distributed DataStore does not work properly with Transaction Chains 33/10833/8
Moiz Raja [Fri, 5 Sep 2014 04:53:46 +0000 (21:53 -0700)]
BUG 1712  - Distributed DataStore does not work properly with Transaction Chains

The fix is as follows,

1. When Creating a trasaction chain create a unique identifier for the transaction chain
   using the member name and the current timestamp

2. When a transaction is created using the transaction chain pass the transaction chain id
   along to the remote shard

3. If the remote shard receives a transaction with a valid transaction chain (one which is
   not empty) then it creates a new transaction chain if one does not exist. If one does exist
   then the Shard just creates a new transaction on the existing transaction chain.
   This way if a single transaction chai was used to create transactions on multiple
   different shards the a transaction chain would  be created on each one of those shards.

4. When a transaction chain is closed a Close Transaction Chain message is broadcast to all
   the Shards in the system. If those shards had a transaction chain with the specified id
   then the transaction chain would be closed. The sender does not care about receiving a
   response

5. When a state change occurs on a Shard we check if the Shard is not a leader. If that is
   the case we automatically close all existing transaction chains on that shard and clear
   the map which tracks the transaction chains for that shard

Change-Id: I6bcfb9de3d0ec666e4152afb69c702dda4f38171
Signed-off-by: Moiz Raja <moraja@cisco.com>
8 years agoBUG-1521 Netconf-netty-util missing unit tests 50/10950/2
Maros Marsalek [Tue, 9 Sep 2014 13:54:48 +0000 (15:54 +0200)]
BUG-1521 Netconf-netty-util missing unit tests

Change-Id: I1cb19296d2c428214212f342fab64999ad3eb5f3
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
8 years agoBug 1520 - Increased test coverage 04/10104/7
Maros Marsalek [Tue, 9 Sep 2014 07:25:17 +0000 (09:25 +0200)]
Bug 1520 - Increased test coverage

Added new tests for ConfigTransactionClients

Change-Id: I0b31e37902804594dda3683556005a3b40414048
Signed-off-by: Igor Bartak <ibartak@cisco.com>
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
8 years agoMetrics and Configuration 65/10665/15
Abhishek Kumar [Wed, 27 Aug 2014 20:07:30 +0000 (13:07 -0700)]
Metrics and Configuration

1. Adds a new abstract class AbstractMeteredUntypedActored that
   extends AbstractUntypedActor. This adds metrics capture
   capability which can be turned on using Config Subsystem.
   By default its turned off.

2. Updates Shard actor; adds metrics capture capability which can be
   turned on via Config Subsystem.

3. In remote-rpc-connector module, we can now pass configuration
   obtained from config subsystem to actor system so that its
   available to all actors. This obviates the need to manually pass
   the configuration via constructors or other *Constant or *Util
   classes. It brings all configuration items in the module at one
   place and makes it easier to move them to config subsystem, if
   its required.

4. In spirit of DRY, moves common code to clustering-commons

5. Minor code inspection fixes.

6. Makes mailbox-capacity configurable via config subsystem.

Patch 9:
Adds a new behaviour (MeteringBehavior.java).
AbstractUntypedActorWithMetering and Shard actor exhibit this
behavior current.
This patch also refactors unified configuration (config subsystem
+ typesafe config) pieces.

Note that in subsequent commits distributed-datastore will have
its configuration added to actor system configuration. Also few
more configuration items in remote-rpc-connector will go to
config subsystem. I wanted to limit the amount of changes going
into this already large commit.

Change-Id: I383ec813c16ed09ed0e68ee59179f454c0d174cf
Signed-off-by: Abhishek Kumar <abhishk2@cisco.com>
8 years agoBUG-1704: do not emit separator 39/10939/1
Robert Varga [Tue, 9 Sep 2014 12:23:23 +0000 (14:23 +0200)]
BUG-1704: do not emit separator

When reusing JSONNormalizedNodeStreamWriter, it retains enough state to
know to emit a separator, so if we do it here, we will break the output.

Change-Id: Ie7acc269b4546230fad532f0abf14c0ba6c4121a
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMerge "Allowed Jolokia to use HttpService"
Moiz Raja [Tue, 9 Sep 2014 12:10:04 +0000 (12:10 +0000)]
Merge "Allowed Jolokia to use HttpService"

8 years agoMerge "BUG-1521 Add missing unit tests for config-persister-impl"
Tony Tkacik [Tue, 9 Sep 2014 07:18:46 +0000 (07:18 +0000)]
Merge "BUG-1521 Add missing unit tests for config-persister-impl"

8 years agoMerge "BUG-650: allocation-free ResolveDataChangeState.needsProcessing()"
Tony Tkacik [Tue, 9 Sep 2014 07:15:44 +0000 (07:15 +0000)]
Merge "BUG-650: allocation-free ResolveDataChangeState.needsProcessing()"

8 years agoMerge "BUG-650: optimize subtree listener collection"
Tony Tkacik [Tue, 9 Sep 2014 07:14:48 +0000 (07:14 +0000)]
Merge "BUG-650: optimize subtree listener collection"

8 years agoMerge "BUG-650: squash maps to Collections.emptyMap()"
Tony Tkacik [Tue, 9 Sep 2014 07:14:03 +0000 (07:14 +0000)]
Merge "BUG-650: squash maps to Collections.emptyMap()"

8 years agoMerge "BUG-650: ResolveDataChangeState.inheritedOne should be a Collection"
Tony Tkacik [Tue, 9 Sep 2014 07:13:36 +0000 (07:13 +0000)]
Merge "BUG-650: ResolveDataChangeState.inheritedOne should be a Collection"

8 years agoMerge "BUG-650: speed up ResolveDataChangeState.needsProcessing()"
Tony Tkacik [Tue, 9 Sep 2014 07:12:46 +0000 (07:12 +0000)]
Merge "BUG-650: speed up ResolveDataChangeState.needsProcessing()"

8 years agoAllowed Jolokia to use HttpService 25/10925/1
Mathieu Lemay [Mon, 8 Sep 2014 22:37:28 +0000 (18:37 -0400)]
Allowed Jolokia to use HttpService

Removed the flag in custom.properties that was preventing Jolokia
from registering to the HttpService. This was ported from previous
distribution but should not be used in karaf-based distros.

Change-Id: I54d143abe9ae6378683b22d83110814b13225fa2
Signed-off-by: Mathieu Lemay <mlemay@inocybe.com>
8 years agoBUG-650: allocation-free ResolveDataChangeState.needsProcessing() 20/10920/2
Robert Varga [Mon, 8 Sep 2014 18:46:32 +0000 (20:46 +0200)]
BUG-650: allocation-free ResolveDataChangeState.needsProcessing()

Critical path optimization. Based on logic introduced in previous
patches, we now know that when the inherited subtree listener iterable
is not a Collection, it is by definition non-empty. Use this knowledge
to elide Iterables.isEmpty() which is (relatively) costly due to
object allocation.

With this patch, ResolveDataChangeState.needsProcessing() does not
allocate any objects and relies on readily-available state to determine
whether additional processing is required.

Change-Id: I0322e0a8f58165f695f2284116057d03e2d4cb45
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-650: optimize subtree listener collection 19/10919/1
Robert Varga [Mon, 8 Sep 2014 18:29:16 +0000 (20:29 +0200)]
BUG-650: optimize subtree listener collection

This further optimizes passing of subtree listeners by retaining the
first collection of subtree listeners rather than immediately skipping
to interable concatenation.

Change-Id: I08fd63b092043ef814a47daba67744042d5c29be
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMerge "Bug 1740: add missing features/mdsal/pom.xml dependencies"
Devin Avery [Mon, 8 Sep 2014 18:17:06 +0000 (18:17 +0000)]
Merge "Bug 1740: add missing features/mdsal/pom.xml dependencies"

8 years agoBUG-650: squash maps to Collections.emptyMap() 14/10914/2
Robert Varga [Mon, 8 Sep 2014 17:11:54 +0000 (19:11 +0200)]
BUG-650: squash maps to Collections.emptyMap()

If possible, we do not retain mutable maps, but rather short-cut to
emptyMap(). This should help us a bit when traversing empty elements.

Change-Id: Iff7eccfcc99c451d11f87cf466c7f09bde63ee10
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-650: ResolveDataChangeState.inheritedOne should be a Collection 15/10915/1
Robert Varga [Mon, 8 Sep 2014 17:20:56 +0000 (19:20 +0200)]
BUG-650: ResolveDataChangeState.inheritedOne should be a Collection

There is no need to demote this to Iterable just to then use
Iterables.isEmpty(), as we are always initializing it with a collection,
which has a quick isEmpty() method. Also promote its order before
interitedSub, so the slow path can be faster a bit.

Change-Id: Ic536e2420cfae98941ec638510c98ec3a8230c09
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-650: speed up ResolveDataChangeState.needsProcessing() 13/10913/2
Robert Varga [Mon, 8 Sep 2014 16:32:39 +0000 (18:32 +0200)]
BUG-650: speed up ResolveDataChangeState.needsProcessing()

Checking for empty subBuilders allows us to reuse the parent's
collection. For simple cases with no listeners whis speeds up
needsProcessing() by completely reusing the emptyList and for
non-trivial cases it just omits object instantiation.

Change-Id: Ib3089bca2ec4f7e1ef826bf4192b8154ff154702
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMerge "Bug 1703: Added debug logging of ignored event to ease debuging."
Ed Warnicke [Mon, 8 Sep 2014 15:08:23 +0000 (15:08 +0000)]
Merge "Bug 1703: Added debug logging of ignored event to ease debuging."

8 years agoMerge "Bug 1731: Breaking dependency cycle between features-{mdsal,aaa}"
Devin Avery [Mon, 8 Sep 2014 14:54:40 +0000 (14:54 +0000)]
Merge "Bug 1731: Breaking dependency cycle between features-{mdsal,aaa}"

8 years agoBUG 1582 - PUT fails validate outer object name 03/10903/1
Jozef Gloncak [Mon, 8 Sep 2014 12:48:53 +0000 (14:48 +0200)]
BUG 1582 - PUT fails validate outer object name

validateTopLevelNodeName method was added.

Change-Id: I6f48ba9350b31d98f765fcb4afb367b8435b4cbd
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
8 years agoBug 1731: Breaking dependency cycle between features-{mdsal,aaa} 78/10878/3
Ed Warnicke [Sat, 6 Sep 2014 20:35:31 +0000 (15:35 -0500)]
Bug 1731: Breaking dependency cycle between features-{mdsal,aaa}

Change-Id: I0f7e94bb322b4e54957868e7cc6c65e235e4c9cc
Signed-off-by: Ed Warnicke <eaw@cisco.com>
8 years agoBug 1740: add missing features/mdsal/pom.xml dependencies 98/10898/1
Ed Warnicke [Mon, 8 Sep 2014 11:21:00 +0000 (06:21 -0500)]
Bug 1740: add missing features/mdsal/pom.xml dependencies

features/mdsal/pom.xml lacks dependencies for the configfiles:

<configfile finalname="configuration/initial/akka.conf">mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/akkaconf</configfile>

<configfile finalname="configuration/initial/module-shards.conf">mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/moduleshardconf</configfile>

<configfile finalname="configuration/initial/modules.conf">mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/moduleconf</configfile>

This patch adds the necessary maven dependencies.

Change-Id: I6e28d4ad8650278fc207f0fb0a22afa4c2ce4bde
Signed-off-by: Ed Warnicke <eaw@cisco.com>
8 years agoMerge "Make generated address configurable for netconf testtool"
Tony Tkacik [Mon, 8 Sep 2014 08:41:17 +0000 (08:41 +0000)]
Merge "Make generated address configurable for netconf testtool"

8 years agoMerge "Bug 1699 - FRM: Change data change listener scope from BASE to SUBTREE"
Tony Tkacik [Mon, 8 Sep 2014 08:22:23 +0000 (08:22 +0000)]
Merge "Bug 1699 - FRM: Change data change listener scope from BASE to SUBTREE"

8 years agoFixed Karaf Distribution Archetype add dependent bundles 77/10877/1
Mathieu Lemay [Sat, 6 Sep 2014 19:04:18 +0000 (15:04 -0400)]
Fixed Karaf Distribution Archetype add dependent bundles

This patch adds the copy-dependencies execution so that bundles are copied
to /system in local distribution for projects using this archetype so that
the final package can be used offline or without local developer .m2 repository.

Change-Id: I4fa661611eeb5e3c0e466fe748e9453264e0695d
Signed-off-by: Mathieu Lemay <mlemay@inocybe.com>
8 years agoMake generated address configurable for netconf testtool 51/10851/1
Maros Marsalek [Fri, 5 Sep 2014 13:59:06 +0000 (15:59 +0200)]
Make generated address configurable for netconf testtool

Change-Id: Ia112bc4108c9d7d8756b755f8e6e660e255a046e
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
8 years agoBug 1699 - FRM: Change data change listener scope from BASE to SUBTREE 61/10761/2
Jan Hajnar [Thu, 4 Sep 2014 11:51:50 +0000 (13:51 +0200)]
Bug 1699 - FRM: Change data change listener scope from BASE to SUBTREE

* changed data change listener scope from BASE to SUBTREE

Change-Id: Ifbc161c2c709157d5665fae9e49059477053ff82
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
8 years agoBUG-1521 Add missing unit tests for config-persister-impl 42/10842/1
Maros Marsalek [Fri, 5 Sep 2014 09:21:01 +0000 (11:21 +0200)]
BUG-1521 Add missing unit tests for config-persister-impl

Change-Id: Id9b6f024da20ea71daa6b29353e39fbdb81e0fb2
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
8 years agoBUG-997: migrate the global context schema service 43/9543/9
Robert Varga [Thu, 31 Jul 2014 15:47:47 +0000 (17:47 +0200)]
BUG-997: migrate the global context schema service

This change test-drives the new re-implementation, making sure we have a
user. An immediate advantage should be faster context convergence times.
Requires I3311a3f0251868f91c385d0291365934ccfb9ede in yangtools.

Change-Id: Ic2f07144043f456ab9821013c1d690904c9a791f
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBug 1703: Added debug logging of ignored event to ease debuging. 38/10838/2
Tony Tkacik [Fri, 5 Sep 2014 07:08:48 +0000 (09:08 +0200)]
Bug 1703: Added debug logging of ignored event to ease debuging.

Change-Id: Ic7bcbc249bb35018561d28d757dadca8509b933c
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoMerge "Enable AD-SAL application to configure OF 1.3 PUSH_VLAN action."
Ed Warnicke [Fri, 5 Sep 2014 07:12:07 +0000 (07:12 +0000)]
Merge "Enable AD-SAL application to configure OF 1.3 PUSH_VLAN action."

8 years agoMerge "Bug 1686 - Rework TopologyManager to use transaction chaining in order to...
Tony Tkacik [Fri, 5 Sep 2014 07:10:27 +0000 (07:10 +0000)]
Merge "Bug 1686 - Rework TopologyManager to use transaction chaining in order to not conflict with itself"

8 years agoMerge "BUG-1690: catch wildcard InstanceIdentifiers"
Tony Tkacik [Fri, 5 Sep 2014 07:10:12 +0000 (07:10 +0000)]
Merge "BUG-1690: catch wildcard InstanceIdentifiers"

8 years agoMerge "Prefer InstanceIdentifier imports"
Tony Tkacik [Fri, 5 Sep 2014 07:09:52 +0000 (07:09 +0000)]
Merge "Prefer InstanceIdentifier imports"

8 years agoMerge "BUG-1679: optinally log allocation context"
Tony Tkacik [Fri, 5 Sep 2014 07:09:35 +0000 (07:09 +0000)]
Merge "BUG-1679: optinally log allocation context"

8 years agoBUG-1617 Add netconf tcp/ssh to karaf features 01/10701/9
Maros Marsalek [Wed, 3 Sep 2014 14:34:24 +0000 (16:34 +0200)]
BUG-1617 Add netconf tcp/ssh to karaf features

Add bouncyCastle security provider to karaf distro

Change-Id: Ia13b1078c62ba39b70ed3d72c29a8e434949d4bb
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
8 years agoMerge "Bug 1446: Add JMX stats for clustered data store"
Moiz Raja [Fri, 5 Sep 2014 02:42:24 +0000 (02:42 +0000)]
Merge "Bug 1446: Add JMX stats for clustered data store"

8 years agoEnable AD-SAL application to configure OF 1.3 PUSH_VLAN action. 01/8801/2
Shigeru Yasuda [Tue, 8 Jul 2014 14:29:39 +0000 (23:29 +0900)]
Enable AD-SAL application to configure OF 1.3 PUSH_VLAN action.

OF 1.3 PUSH_VLAN action takes only one argument, ethernet type,
and its value must be 0x8100 or 0x88a8.

Change-Id: I4d6bcabb430245594b747e31f9edb2034f39acb6
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>
8 years agoImplement creating and applying of snapshot for a shard 96/10496/7
Moiz Raja [Wed, 27 Aug 2014 21:12:36 +0000 (14:12 -0700)]
Implement creating and applying of snapshot for a shard

This commit implements creating and applying of snapshot as per the
RaftActor contract.

There was an issue related to recovery which was occurring because Shard
was created without a schemaContext so there are changes in this commit
which ensure that the Shard is not created before a schemaContext is
received

Change-Id: I45fd64885f09fac57f1f5ff235144064b94ab129
Signed-off-by: Moiz Raja <moraja@cisco.com>
8 years agoMerge "BUG 1623 - Clustering : Parsing Error thrown on startup"
Ed Warnicke [Thu, 4 Sep 2014 22:53:58 +0000 (22:53 +0000)]
Merge "BUG 1623 - Clustering : Parsing Error thrown on startup"

8 years agoMerge "BUG 1595 - Clustering : NPE on startup"
Ed Warnicke [Thu, 4 Sep 2014 22:53:39 +0000 (22:53 +0000)]
Merge "BUG 1595 - Clustering : NPE on startup"

8 years agoMerge "Bug 1637: Change Rpc actor calls to async"
Moiz Raja [Thu, 4 Sep 2014 22:47:29 +0000 (22:47 +0000)]
Merge "Bug 1637: Change Rpc actor calls to async"

8 years agoMerge "Initial clustering feature"
Devin Avery [Thu, 4 Sep 2014 22:41:44 +0000 (22:41 +0000)]
Merge "Initial clustering feature"

8 years agoMerge "Install snapshot and Reply"
Moiz Raja [Thu, 4 Sep 2014 21:26:58 +0000 (21:26 +0000)]
Merge "Install snapshot and Reply"

8 years agoMerge "OVSDB L3 support: Allow for override of default gateway mac address"
Madhu Venugopal [Thu, 4 Sep 2014 21:24:42 +0000 (21:24 +0000)]
Merge "OVSDB L3 support: Allow for override of default gateway mac address"

8 years agoInitial clustering feature 50/10550/9
Ed Warnicke [Wed, 27 Aug 2014 21:09:18 +0000 (16:09 -0500)]
Initial clustering feature

Besides the clustering feature changes a couple of other changes
had to be made to the distributed data store and remote rpc modules
to make the solution work with karaf

1. The akka.conf in sal-clustering-config has now been changed so that
it works in a single node cluster out of the box. Specifically the hostnames
have been set to 127.0.0.1 and the member role has been set to member-1

2. The distributed-data-store and the remote-rpcconnector now load akka
configuration from the configuration/initial folder. The positive thing about
this is that even in a multi-node cluster one does not need to pass the location
of akka.conf on the command line. The negative thing about this is that you
cannot change the location from which the akka configuration can be picked up.
Though this should be ok because we specifically pick modules.conf and
module-shards.conf from the configuration/initial folder as well.

3. The Protobuf bundle has now been wrapped and a Dynamic Import has been
added to it so that it can deserialized specific protocol buffer messages

4. The RestConfProvider was not written to shutdown correctly. While this is
not normally an issue it does become an issue when the clustering feature is
loaded for the first time because in that case the RestConfProvider may need
to be shutdown by the config sub-system

Change-Id: I1701ae8e9508c82779483963fb73b6af91095d7d
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Signed-off-by: Moiz Raja <moraja@cisco.com>
8 years agoBUG-1679: optinally log allocation context 09/10709/4
Robert Varga [Wed, 3 Sep 2014 16:19:52 +0000 (18:19 +0200)]
BUG-1679: optinally log allocation context

Transactions can now print their allocation context.

Change-Id: I801a44d1270f8becd2835cc31b514e2e0fdaee33
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-1690: catch wildcard InstanceIdentifiers 67/10767/2
Robert Varga [Thu, 4 Sep 2014 12:19:01 +0000 (14:19 +0200)]
BUG-1690: catch wildcard InstanceIdentifiers

Read/write/merge/delete of wildcarded instance identifiers is not
defined, so catch them early on in the binding broker implementation.

Change-Id: I97161f88b8496a78575d6a7bc1b7bab8fee1da5b
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoPrefer InstanceIdentifier imports 66/10766/2
Robert Varga [Thu, 4 Sep 2014 10:26:44 +0000 (12:26 +0200)]
Prefer InstanceIdentifier imports

InstanceIdentifier/YangInstanceIdentifier are now separate, so we can
import them at the same time. Do precisely that.

Change-Id: I54a5cd49ef7b8584a5b09a12ab97e132fb92cb57
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMerge "Bug 1666: Fixing the clustering config file issue"
Moiz Raja [Thu, 4 Sep 2014 17:57:21 +0000 (17:57 +0000)]
Merge "Bug 1666: Fixing the clustering config file issue"

8 years agoMerge "Bug 1608: Make ActorContext ASK_DURATION configurable"
Moiz Raja [Thu, 4 Sep 2014 17:52:34 +0000 (17:52 +0000)]
Merge "Bug 1608: Make ActorContext ASK_DURATION configurable"

8 years agoOVSDB L3 support: Allow for override of default gateway mac address 93/10793/1
Flavio Fernandes [Thu, 4 Sep 2014 17:11:21 +0000 (13:11 -0400)]
OVSDB L3 support: Allow for override of default gateway mac address

With this change we are introducing a new system config that will be used by ovsdb's l3
implementation: ovsdb.l3gateway.mac

Its good to note here that until bug 1705 is fixed, this config will be needed so that
initial implementation is able to route packets to subnets outside the neutron l3
subnets.

Change-Id: Iaca1be3651aeff92b789b451df12e77ba842508e
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
8 years agoMerge changes I9aa41251,Ibd0fb687
Ed Warnicke [Thu, 4 Sep 2014 17:01:41 +0000 (17:01 +0000)]
Merge changes I9aa41251,Ibd0fb687

* changes:
  Bug 1703: Fixed memory leak in TransactionChain
  Bug 222: Added basic Restconf operational statistics

8 years agoMerge "Upgrading Apache Tomcat Patch version from 7.0.32 to 7.0.53 for traditional...
Devin Avery [Thu, 4 Sep 2014 16:17:31 +0000 (16:17 +0000)]
Merge "Upgrading Apache Tomcat Patch version from 7.0.32 to 7.0.53 for traditional controller distribution (Karaf already upgraded)."