controller.git
10 years agoBug 2517: Catch RuntimeExceptions thrown from the DCL in DataChangeListener 35/13835/2
tpantelis [Mon, 8 Dec 2014 14:25:16 +0000 (09:25 -0500)]
Bug 2517: Catch RuntimeExceptions thrown from the DCL in DataChangeListener

This prevents akka from suppressing/dropping subsequent data change
events if a RuntimeException is propagated to akka.

Change-Id: Ibc90e00c56a3e3b6f0039ff609d639fe8201adf0
Signed-off-by: tpantelis <tpanteli@brocade.com>
(cherry picked from commit 75495f26e7718da7d6f9e0ad06af1caa2e3ebf08)

10 years agoBUG-2511: disable external entitiy resolution with EXI 74/13774/1
Colin Dixon [Mon, 15 Dec 2014 13:38:25 +0000 (14:38 +0100)]
BUG-2511: disable external entitiy resolution with EXI

OpenEXI transmogrifier can resolve external entities. This should never
be necessary in NETCONF context, so disallow that. The same goes for the
reader, but there we need to add a custom EntityResolver.

Origial work done by Robert Vargag. Cherry-picked from
8350f87e0e1190fcc84099d3b7446a2f1de9e5f9 by Colin Dixon.

Change-Id: Idf4b7faf13063c88624f2ba16f3871679c072b3e
Signed-off-by: Robert Varga <rovarga@cisco.com>
Signed-off-by: Colin Dixon <colin@colindixon.com>
10 years agoMerge "Remove unneeded embedded dependency" into stable/helium
Anil Vishnoi [Thu, 18 Dec 2014 19:40:46 +0000 (19:40 +0000)]
Merge "Remove unneeded embedded dependency" into stable/helium

10 years agoMerge "Fix bug 2449 in sal-remoterpc-connector Regarding to Moiz's comments, replace...
Moiz Raja [Thu, 18 Dec 2014 14:23:44 +0000 (14:23 +0000)]
Merge "Fix bug 2449 in sal-remoterpc-connector Regarding to Moiz's comments, replace sender from null to ActorRef.noSender() in RpcManager.java" into stable/helium

10 years agoFix bug 2449 in sal-remoterpc-connector 18/13218/2
Xin Chang [Sat, 29 Nov 2014 07:23:15 +0000 (15:23 +0800)]
Fix bug 2449 in sal-remoterpc-connector
Regarding to Moiz's comments, replace sender from null to
ActorRef.noSender() in RpcManager.java

Register SchemeContextListener with global SchemeService and push scheme
context to RpcBroker

Change-Id: Ia941f25f7b82a8146bf412389fbea5219c76f55a
Signed-off-by: Xin Chang <xin.chang@huawei.com>
10 years agoBUG-2511 Fix XXE vulnerability in initial config loaders 30/13730/1
Maros Marsalek [Thu, 18 Dec 2014 09:33:02 +0000 (10:33 +0100)]
BUG-2511 Fix XXE vulnerability in initial config loaders

Change-Id: I0b9aefa8d7a2d59f542075172fe03678618a6385
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoRemove unneeded embedded dependency 12/13712/1
Robert Varga [Thu, 13 Nov 2014 22:12:38 +0000 (23:12 +0100)]
Remove unneeded embedded dependency

yangtools:util already embeds the dependency with a different version,
causing a potential clash. Since sal-dom-broker is not a direct user,
this will work just fine.

Change-Id: If92555d6feb15c6ee9495fb789244750a48e9129
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit b0ab6a3cbc68fbd859151507622c651f823714a5)

10 years agoMerge "BUG-2459: do not instantiate factories in fastpath" into stable/helium
Tony Tkacik [Tue, 16 Dec 2014 12:47:21 +0000 (12:47 +0000)]
Merge "BUG-2459: do not instantiate factories in fastpath" into stable/helium

10 years agoMerge "Bug 2405 - sal-binding-broker tests use openflow model" into stable/helium
Tony Tkacik [Mon, 15 Dec 2014 15:06:08 +0000 (15:06 +0000)]
Merge "Bug 2405 - sal-binding-broker tests use openflow model" into stable/helium

10 years agoMerge "BUG-2511 Fix possible XXE vulnerability in restconf" into stable/helium
Tony Tkacik [Mon, 15 Dec 2014 14:58:03 +0000 (14:58 +0000)]
Merge "BUG-2511 Fix possible XXE vulnerability in restconf" into stable/helium

10 years agoBUG-2511 Fix possible XXE vulnerability in restconf 50/13650/2
Maros Marsalek [Mon, 15 Dec 2014 11:19:11 +0000 (12:19 +0100)]
BUG-2511 Fix possible XXE vulnerability in restconf

Change-Id: I16eaf8a743b94ec26e3ac427fb777d0c769ec3c2
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoBUG-2511 Fix XXE vulnerability in Netconf 46/13646/1
Maros Marsalek [Mon, 15 Dec 2014 10:03:56 +0000 (11:03 +0100)]
BUG-2511 Fix XXE vulnerability in Netconf

Change-Id: Ifc1d63fc632e7395a46d85fc2ccb9095e7008430
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoMerge "BUG-2510: handle RPC route removal" into stable/helium
Tony Tkacik [Mon, 15 Dec 2014 08:54:43 +0000 (08:54 +0000)]
Merge "BUG-2510: handle RPC route removal" into stable/helium

10 years agoBug 2405 - sal-binding-broker tests use openflow model 79/12979/3
Jan Hajnar [Tue, 18 Nov 2014 15:29:09 +0000 (16:29 +0100)]
Bug 2405 - sal-binding-broker tests use openflow model

* removed and recreated openflow protocol specific code from tests

Change-Id: I9dce5d9122974b5d7a58fcb040cb3befc2498e93
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
10 years agoBUG-2510: handle RPC route removal 35/13635/2
Robert Varga [Sun, 14 Dec 2014 18:32:13 +0000 (19:32 +0100)]
BUG-2510: handle RPC route removal

DOM to Binding forwarding ignored removals of RPC implementations. Add
that case back.

Change-Id: I7af1d8b43b9b229cc9a696cfdfc61146f960b374
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 11380c5b8bc0d9831ed182ed758a74f66278df78)

10 years agoBUG-2510: Remove all registrations when a routed rpc is closed 34/13634/2
Robert Varga [Sun, 14 Dec 2014 18:20:00 +0000 (19:20 +0100)]
BUG-2510: Remove all registrations when a routed rpc is closed

The API contract specifies that the effects of a Registration are
removed on close(). Unfortunately the routed RPC case is more funny, as
it has sub-registrations, for each added path -- and we have no mention
of the fact that the user should be removing them.

Hence we need to handle the user expecting us to remove any and all
paths which have been registered.

Change-Id: Iedf451c2a481d648173819f895cccb9e63c54d99
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 940751adf968a6789514566281bb0817bbf07878)

10 years agoBUG-2459: do not instantiate factories in fastpath 44/13644/1
Robert Varga [Thu, 11 Dec 2014 10:08:26 +0000 (11:08 +0100)]
BUG-2459: do not instantiate factories in fastpath

This caches the factories in static fields rather than instantiating
them on each call.

Change-Id: I4dfee7724320914f2c7c9724192e4653deea3cde
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit a69a67c76a04a89d870e9f12df7919cbeb0d5001)

10 years agoBUG 2463 - Changing setting for shard-snapshot-data-threshold-percentage does not... 87/13387/1
Moiz Raja [Wed, 3 Dec 2014 13:20:33 +0000 (05:20 -0800)]
BUG 2463 - Changing setting for shard-snapshot-data-threshold-percentage does not work

This was missed by the commit which introduced this setting. It was not read from the config
and set on the DataStoreContext. This meant that the default (12 percent) was used regardless
of the actual setting.

Also changed the name of the stat to InMemoryJournalDataSize instead of just DataSize to be
more clear

Change-Id: Iaffddb3e614db7a270d847ba219801e36c8a64e0
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoMerge "Bug 2368: MD-SAL FRM may update/remove unexpected flow entries." into stable...
Anil Vishnoi [Wed, 3 Dec 2014 11:27:32 +0000 (11:27 +0000)]
Merge "Bug 2368: MD-SAL FRM may update/remove unexpected flow entries." into stable/helium

10 years agoFix bug 2450 - Statistics collection slow - performance 08/13308/3
Vaclav Demcak [Tue, 2 Dec 2014 10:36:34 +0000 (11:36 +0100)]
Fix bug 2450 - Statistics collection slow - performance

* fix timeout value for statWaiter to notification (30 sec is mistake - 3sec is correct value)
* add check TransactionId for every notification (prevent unexpected notification for collecting next statistics)
* timeout has to clear TransactionId (prevention for notification from slower statistics processes

* patch 3  - revert the log level msg (debuging issue in StatPermCollectorImpl)
- change an expiration calculation for cached RPC results (StatRpcMsgManagerImpl)
- fix conditions for call notifyToCollectNextStat (Meter, Group)

succesfull tested for karaf-compatible

Change-Id: I54d7fe9e5c1a5d265c9378507fce1163691b62e5
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
10 years agoMerge "Bug 2175 - Migrate frm, statistics and inventory manager to config subsystem...
Anil Vishnoi [Tue, 2 Dec 2014 10:11:07 +0000 (10:11 +0000)]
Merge "Bug 2175 - Migrate frm, statistics and inventory manager to config subsystem" into stable/helium

10 years agoBug 2175 - Migrate frm, statistics and inventory manager to config subsystem 09/13009/7
Vaclav Demcak [Tue, 2 Dec 2014 08:29:31 +0000 (09:29 +0100)]
Bug 2175 - Migrate frm, statistics and inventory manager to config subsystem

* migrated statistics manager to config subsystem
* updated tests
* patch resolves Bug 1646 and Bug 2079
* Patch Set 6 - add log.warn msg for a fail loading xml ConfigSubsystem input value + fix MIN_REQUEST_NET_MONITOR_INTERVAL_DEFAULT to 3sec (follow Anil's comment)

Change-Id: I67d398c82c3dafbb2ef759d07a80d17ad6656c1e
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
10 years agoMerge "Bug-2397:Provide a mechanism for stakeholders to get notifications on Raft...
Moiz Raja [Tue, 2 Dec 2014 02:27:45 +0000 (02:27 +0000)]
Merge "Bug-2397:Provide a mechanism for stakeholders to get notifications on Raft state change" into stable/helium

10 years agoBUG 2437 - Enable snapshotting based on size of data in the in-memory journal 90/13290/1
Moiz Raja [Wed, 26 Nov 2014 17:07:40 +0000 (09:07 -0800)]
BUG 2437 - Enable snapshotting based on size of data in the in-memory journal

- Changed RaftActor to snapshot based on the transaction count or the size of the
  data in the in-memory journal whichever comes earlier
- The size of data that is used is the rough (not-accurate) size of the Payload
  in the Replicated log entry
- In ShardStats exposed another property which is the data size of the in-memory
  journal
- The snapshot data threshold percentage is configurable using the config sub-system and is
  set to a default of 12%. The reason for setting it at 12% by default is because we have
  a total of 8 default shards out of the box. I could have set this to 16% as toaster is not
  a "real" data shard.
- The snapshot data threshold is calculated as a percentage of the Runtime.totalMemory()
  which is the total memory the jvm considers available for object allocation. From testing
  it appears that the total memory is what would appear in jconsole as the committed memory.

I have not added any unit testing for this - but tested this using the scenario described in
bug 2437 and it seems to work pretty well. The deployment used only 2G of memory and worked
fine for a 7 switch topology and I observed that it had not run out of memory after more than
2 hours.

Change-Id: I09ec0827c0411c42a9224bb6d159d5590c22e20b
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBUG 2371 : Leader should reset it's snapshot tracking when follower is restarted 87/13287/1
Moiz Raja [Tue, 25 Nov 2014 05:22:34 +0000 (21:22 -0800)]
BUG 2371 : Leader should reset it's snapshot tracking when follower is restarted

This patch adds a new protocol to InstallSnapshot. It the InstallSnapshotReply returns
a failure and the chunkIndex is -1 then the Leader will reset the FollowerSnapshot so
that when the next heartbeat occurs the Leader would start sending chunks from the beginning.

Change-Id: I0d5f0a4230209856ecf9bcef46220ae348f52b5d
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBug-2397:Provide a mechanism for stakeholders to get notifications on Raft state... 86/13286/1
Kamal Rameshan [Tue, 18 Nov 2014 23:26:51 +0000 (15:26 -0800)]
Bug-2397:Provide a mechanism for stakeholders to get notifications on Raft state change

A notifier actor is spawned from the RaftActor inherited implementation, in our case Shard or ExampleActor .

Its injected into the RaftActor.RaftActor notifies the notifier with the role changes. The Notification message is local to Shard or Example.

The idea is for any implementation to create a notifier, inject it and issue a notification from that notifier on a role change.

A sample example notifier, listener and notification is provided to show how a listener can register with the notifier and get notifications form the notifier.

Notifier and Notifications are assembled in commons, to be shared along with other apps who might need similar logic. It can be override by specific implementations.

Has been tested with the TestDriver, with separate actorsystems for listner and notifier

Tests have been added.

Change-Id: I23f16d4e76bb7dae640c544df282293274d9a1cb
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
(cherry picked from commit a469dbcec569cc972df0cd57cf725a2173d2604a)

10 years agoMerge "Bug 2435 - Controller/MD-SAL throwing ModifiedNodeDoesNotExistException except...
Devin Avery [Mon, 1 Dec 2014 13:48:46 +0000 (13:48 +0000)]
Merge "Bug 2435 - Controller/MD-SAL throwing ModifiedNodeDoesNotExistException exception when statistics manager augment queue statistics to the node connector. Exception was thrown because parent (queue) container was not present when statistics manager tried to augment statistics. Fixed the issue by creating empty queue container and 'merge'ing it to the node connector before augmenting the statistics." into stable/helium

10 years agoMerge "BUG-2340 Fix improper cleanup of resources in netconf ssh handler" into stable...
Tony Tkacik [Mon, 1 Dec 2014 08:25:02 +0000 (08:25 +0000)]
Merge "BUG-2340 Fix improper cleanup of resources in netconf ssh handler" into stable/helium

10 years agoBug 2372: Removing duplicate call in loadBalancerPoolNorthbound 38/13138/2
Srini Seetharaman [Tue, 25 Nov 2014 20:47:32 +0000 (12:47 -0800)]
Bug 2372: Removing duplicate call in loadBalancerPoolNorthbound
to loadBalancerPoolInterface.addNeutronLoadBalancerPool(singleton);

Change-Id: I7fe59ca72505838dd377c4689615cfc161eff179
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>
10 years agoBUG-2340 Fix improper cleanup of resources in netconf ssh handler 98/13198/2
Maros Marsalek [Fri, 28 Nov 2014 11:19:19 +0000 (12:19 +0100)]
BUG-2340 Fix improper cleanup of resources in netconf ssh handler

This commit also fixes proper reconnect scheduling for netconf-connector.

Change-Id: I1d848af57fddc35e73596fc47f8c7318b8747130
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoBug 2435 - Controller/MD-SAL throwing ModifiedNodeDoesNotExistException exception... 82/13182/1
Anil Vishnoi [Wed, 26 Nov 2014 21:28:41 +0000 (02:58 +0530)]
Bug 2435 - Controller/MD-SAL throwing ModifiedNodeDoesNotExistException exception when statistics manager
augment queue statistics to the node connector. Exception was thrown because parent (queue) container was
not present when statistics manager tried to augment statistics. Fixed the issue by creating empty queue
container and 'merge'ing it to the node connector before augmenting the statistics.

Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
Change-Id: I7d68f3e177ccf62c7adf154e655226450a74296c

10 years agoFix bug 2413 NPE for group and meters 87/12987/2
Vaclav Demcak [Mon, 27 Oct 2014 23:17:39 +0000 (00:17 +0100)]
Fix bug 2413 NPE for group and meters

* group/meter features
* Device RPC features Calls for group/meter depend on FlowCapableNode data change event (create event only)
* Remove Meter's and Group's feature calls from perm. stat. collect
* Add API methods for additional registration new StatCapabTypes for a specific Node statistic collecting process
* Fix NPE for features
* refactoring group/meter stats update processing (Target: Don't block the RPC Notification threads as soon as is possible)
* Fix NPE List processing
* queue - add delete processing (becasue queues has to be edit outside and we are not cleaning it)
* add validations input values
* remove unnecessary validation input values (StatRpcMsgManagerImpl)

Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
Change-Id: If10a0ea0bb098ca70cd19ce32a7ca5790159aae5

10 years agoMerge "bug 2266 : added more types of schema nodes to increase code coverage" into...
Moiz Raja [Wed, 26 Nov 2014 18:36:33 +0000 (18:36 +0000)]
Merge "bug 2266 : added more types of schema nodes to increase code coverage" into stable/helium

10 years agoMerge "Bug-2277: fix the Leader test failing in jenkins" into stable/helium
Tom Pantelis [Wed, 26 Nov 2014 00:20:32 +0000 (00:20 +0000)]
Merge "Bug-2277: fix the Leader test failing in jenkins" into stable/helium

10 years agoMerge "Bug-2277 : Isolated Leader Implementation" into stable/helium
Tom Pantelis [Wed, 26 Nov 2014 00:19:53 +0000 (00:19 +0000)]
Merge "Bug-2277 : Isolated Leader Implementation" into stable/helium

10 years agoBUG-1953: fix SAL compatility layer 11/13111/1
Robert Varga [Fri, 19 Sep 2014 19:41:45 +0000 (21:41 +0200)]
BUG-1953: fix SAL compatility layer

Sal compatibility produces pure addresses instead of prefixes as
dictated by the model. Fix moth tests and implementation to emit
prefixes.

Change-Id: I1aca04c0fc22aa973d9578fea33550194c6f9264
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit da19620fa7bf6af3ab28c90ebd4df8eec920ec2c)

10 years agoMerge "Bug 2328: Change ensureParent algorithm." into stable/helium
Ed Warnicke [Mon, 24 Nov 2014 23:57:16 +0000 (23:57 +0000)]
Merge "Bug 2328: Change ensureParent algorithm." into stable/helium

10 years agoBug-2277: fix the Leader test failing in jenkins 52/13052/1
Kamal Rameshan [Thu, 20 Nov 2014 03:21:14 +0000 (19:21 -0800)]
Bug-2277: fix the Leader test failing in jenkins

Change-Id: I149d643b517df5010595962cbdf616c2b2fb9945
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
10 years agoBug-2277 : Isolated Leader Implementation 51/13051/1
Kamal Rameshan [Thu, 13 Nov 2014 00:00:34 +0000 (16:00 -0800)]
Bug-2277 : Isolated Leader Implementation

A new RaftState has been added and on a scheduler, we check if the leader is isolated, looking at the majority peer statuses.
If Yes, then it switches the behavior to IsolatedLeader.

On the receipt of each AppendEntriesReply, the IsolatedLeader checks for isolation.
And if no, then switches back to either Leader or Follower.

These changes have been tested with TestDriver  and 3 node cluster and the switching of Leader to IsolatedLeader and back,
on the stopping and reinstating of followers, was successful.

The Isolated Leader check interval can be configured via the config subsystem

Change-Id: I42b9165cc477d812c7e0e02339537c0f1fe74934
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
10 years agobug 2266 : added more types of schema nodes to increase code coverage 38/13038/1
Harman Singh [Fri, 21 Nov 2014 03:49:07 +0000 (19:49 -0800)]
bug 2266 : added more types of schema nodes to increase code coverage

Change-Id: I7372157ffc2b2e69ff9ae34b44eaeecadbf6b75d
Signed-off-by: Harman Singh <harmasin@cisco.com>
10 years agoMerge "BUG-2304 Fix subtree filter in netconf-impl for identityrefs." into stable...
Tony Tkacik [Thu, 20 Nov 2014 11:13:04 +0000 (11:13 +0000)]
Merge "BUG-2304 Fix subtree filter in netconf-impl for identityrefs." into stable/helium

10 years agoMerge "BUG 2155 - depth parameter in URI" into stable/helium
Tony Tkacik [Thu, 20 Nov 2014 08:45:34 +0000 (08:45 +0000)]
Merge "BUG 2155 - depth parameter in URI" into stable/helium

10 years agoBUG-2304 Fix subtree filter in netconf-impl for identityrefs. 74/12974/1
Maros Marsalek [Thu, 20 Nov 2014 08:03:10 +0000 (09:03 +0100)]
BUG-2304 Fix subtree filter in netconf-impl for identityrefs.

There was a bug in prefixed content comparison.

Change-Id: I5815b9bef404c0d3785b52a9450cb667ac798b9f
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoMerge "Bug 2233 - RPC register exception when rpc has no input" into stable/helium
Tony Tkacik [Tue, 18 Nov 2014 09:38:27 +0000 (09:38 +0000)]
Merge "Bug 2233 - RPC register exception when rpc has no input" into stable/helium

10 years agoMerge "BUG-2370 Reset schema context on disconnect in nc" into stable/helium
Tony Tkacik [Tue, 18 Nov 2014 09:37:36 +0000 (09:37 +0000)]
Merge "BUG-2370 Reset schema context on disconnect in nc" into stable/helium

10 years agoBug 2368: MD-SAL FRM may update/remove unexpected flow entries. 05/12905/1
Shigeru Yasuda [Wed, 12 Nov 2014 15:23:08 +0000 (00:23 +0900)]
Bug 2368: MD-SAL FRM may update/remove unexpected flow entries.

FRM should always set strict flag into update-flow/remove-flow
RPC input.

Change-Id: I6027442b56f4cd93cfc3f954dc8501bb57e2d64a
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>
(cherry picked from commit 41d00971714a0e52d37c67734a22068103244224)

10 years agoRevert "Revert "Merge "Revert "Bug 1764 - added service for pushing default node... 14/12714/4
Thanh Ha [Tue, 11 Nov 2014 03:29:11 +0000 (22:29 -0500)]
Revert "Revert "Merge "Revert "Bug 1764 - added service for pushing default node configuration"" into stable/helium""

This reverts commit 64544f998de558cb6219e166a8fdb3f5e3c80589.

Change-Id: Ib4f3e1db5ed9f6b8ee145060d8e9845122f33e15
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
10 years agoRevert "Revert "BUG-2254 Enable schema-less rpcs invocation in netconf-connector"" 13/12713/4
Thanh Ha [Tue, 11 Nov 2014 03:28:43 +0000 (22:28 -0500)]
Revert "Revert "BUG-2254 Enable schema-less rpcs invocation in netconf-connector""

This reverts commit 294bfea81a17c03f8ef11f67c7ea9f9277d46d6c.

Change-Id: I6f10689dd79de527c1e78c3a42390cebe3983ad5
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
10 years agoRevert "Revert "BUG-2254 Make runtime rpcs in config subsystem/netconf handle context... 12/12712/4
Thanh Ha [Tue, 11 Nov 2014 03:28:08 +0000 (22:28 -0500)]
Revert "Revert "BUG-2254 Make runtime rpcs in config subsystem/netconf handle context-instance attribute with namespaces""

This reverts commit 63146c45f2c982be3703bf3aae137cbd9498ce76.

Change-Id: Ic5c69846d4418b96c5c1a4036c62e3866f26ac42
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
10 years agoMerge "Bug-2136 - fix for is-local-path" into stable/helium
Moiz Raja [Sat, 15 Nov 2014 20:27:18 +0000 (20:27 +0000)]
Merge "Bug-2136 - fix for is-local-path" into stable/helium

10 years agoMerge "BUG 2302 : odl-clustering-test-app should not be part of the odl-restconf...
Moiz Raja [Sat, 15 Nov 2014 20:08:07 +0000 (20:08 +0000)]
Merge "BUG 2302 : odl-clustering-test-app should not be part of the odl-restconf-all feature set" into stable/helium

10 years agoMerge "Bug 2347: Minor fixes to correct log output" into stable/helium
Moiz Raja [Sat, 15 Nov 2014 19:44:26 +0000 (19:44 +0000)]
Merge "Bug 2347: Minor fixes to correct log output" into stable/helium

10 years agoMerge "BUG 2353 : Handle binary, bits and instanceidentifier types in NodeIdentifiers...
Moiz Raja [Sat, 15 Nov 2014 19:42:17 +0000 (19:42 +0000)]
Merge "BUG 2353 : Handle binary, bits and instanceidentifier types in NodeIdentifiers" into stable/helium

10 years agoBug-2136 - fix for is-local-path 86/12886/1
Kamal Rameshan [Mon, 10 Nov 2014 22:35:39 +0000 (14:35 -0800)]
Bug-2136 - fix for is-local-path

Change-Id: I38a58683c94c54e9f399df56aa586e3916f75e41
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
(cherry picked from commit a8477c3af9b6b2de6037404f11e1835ac6c710c2)

10 years agoBUG 2302 : odl-clustering-test-app should not be part of the odl-restconf-all feature set 83/12883/1
Moiz Raja [Tue, 11 Nov 2014 01:27:18 +0000 (17:27 -0800)]
BUG 2302 : odl-clustering-test-app should not be part of the odl-restconf-all feature set

This patch does the following,

1. It removes odl-clustering-test-app from the restconf features
2. Move odl-clustering-test-app to the md-sal feature (just like odl-toaster)
3. Removes all unneccessary dependencies from odl-clustering-test-app
4. Removes all the clustering configuration files from the odl-clustering-test-app feature

This now allows the odl-clustering-test-app to be used with/without clustering. It also
eliminates the problem is inadvertently installing the odl-clustering-test-app when installing
odl-restconf-all.

Change-Id: I8021f88c967576aa8cf8da54dbfa8f4464233bc3
Signed-off-by: Moiz Raja <moraja@cisco.com>
(cherry picked from commit fba140bf09ffbf8694aa41f544caaa331c2ec29a)

10 years agoBug 2340: Fixed chained Tx not ready prior next create 81/12881/2
tpantelis [Sun, 2 Nov 2014 21:44:34 +0000 (16:44 -0500)]
Bug 2340: Fixed chained Tx not ready prior next create

On new*Transaction, utilized the new State classes to obtain
the previous Tx's ready Futures and pass then to the new
ChainedTransactionProxy. This makes it deterministic so that
a Tx will always get ready Futures from the previous Tx.

Change-Id: Icc017285bd5ceb118e98d3e38ec9a10a9144155e
Signed-off-by: tpantelis <tpanteli@brocade.com>
10 years agoMerge "Bug-2301 - Clustering:Snapshots need not be stored in in-mem ReplicatedLog...
Moiz Raja [Sat, 15 Nov 2014 17:26:27 +0000 (17:26 +0000)]
Merge "Bug-2301 - Clustering:Snapshots need not be stored in in-mem ReplicatedLog for Installing snapshots" into stable/helium

10 years agoMerge "BUG 2303 : Remove the implementation of AddRaftPeer/RemoveRaftPeer" into stabl...
Moiz Raja [Sat, 15 Nov 2014 17:25:36 +0000 (17:25 +0000)]
Merge "BUG 2303 : Remove the implementation of AddRaftPeer/RemoveRaftPeer" into stable/helium

10 years agoBug 2347: Minor fixes to correct log output 82/12882/1
tpantelis [Thu, 13 Nov 2014 02:57:49 +0000 (21:57 -0500)]
Bug 2347: Minor fixes to correct log output

DOMConcurrentDataCommitCoordinator#handleException hard-codes the error
mapper to CAN_COMMIT_ERROR_MAPPER however this should be passed
in corresponding to the phase.

In TransactionCommitFailedExceptionMapper, the opNames for
PRE_COMMIT_MAPPER and CAN_COMMIT_ERROR_MAPPER are reversed, should be
"preCommit", "canCommit" respectively.

Change-Id: I6c0513f0f6265ec19de39476c95efefee53d2ee1
Signed-off-by: tpantelis <tpanteli@brocade.com>
(cherry picked from commit bda2f4ab9ecd693f85ff21e2bf94fe55ca90608b)

10 years agoMerge "Bug 2347: DOMConcurrentDataCommitCoordinator uses wrong phase name" into stabl...
tpantelis [Sat, 15 Nov 2014 17:13:01 +0000 (17:13 +0000)]
Merge "Bug 2347: DOMConcurrentDataCommitCoordinator uses wrong phase name" into stable/helium

10 years agoBug-2301 - Clustering:Snapshots need not be stored in in-mem ReplicatedLog for Instal... 80/12880/1
Kamal Rameshan [Wed, 5 Nov 2014 00:50:26 +0000 (16:50 -0800)]
Bug-2301 - Clustering:Snapshots need not be stored in in-mem ReplicatedLog for Installing snapshots

1. Snapshots, once persisted to disk, would not be stored as part of ReplicatedLog in memory
2. An Install snapshot would initiate a snapshot capture and be sent to the follower
3. FollowerLogInformation in Leader has a stopwatch which helps to find if a given follower is active/up.

Rebased

Change-Id: If7aac2518a0f624a0cc121112ce165456d002a18
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
(cherry picked from commit 2b0c99463883b10d5eacdec901d7543d5815a54f)

10 years agoBUG 2303 : Remove the implementation of AddRaftPeer/RemoveRaftPeer 72/12472/4
Moiz Raja [Tue, 4 Nov 2014 01:10:59 +0000 (17:10 -0800)]
BUG 2303 : Remove the implementation of AddRaftPeer/RemoveRaftPeer

It is both unused and incorrect

Change-Id: Ie0a9844ccf4de7dae68586954031599b55646c47
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBUG 2339 : TransactionChain id created by the Clustered Data Store are not unique 79/12879/1
Moiz Raja [Sat, 8 Nov 2014 02:12:45 +0000 (18:12 -0800)]
BUG 2339 : TransactionChain id created by the Clustered Data Store are not unique

The fix is to use a simple atomically incrementing integer to form the transaction chain
identifier instead of using the system time.

I also added a few log statements in there which were helpful in debugging the issue.

Change-Id: Ie1465f1640d6be0ff9da0f66477ebafc7ebff137
Signed-off-by: Moiz Raja <moraja@cisco.com>
(cherry picked from commit 4dd0108a91d84a7133ef6b781911e87903981bc1)

10 years agoMerge "Bug 2318: Follow-up changes for previous patch 12535" into stable/helium
tpantelis [Sat, 15 Nov 2014 15:42:10 +0000 (15:42 +0000)]
Merge "Bug 2318: Follow-up changes for previous patch 12535" into stable/helium

10 years agoMerge "BUG 2090 : Clustering : Bring akka-raft unit test coverage upto 80%" into...
Tom Pantelis [Sat, 15 Nov 2014 14:18:38 +0000 (14:18 +0000)]
Merge "BUG 2090 : Clustering : Bring akka-raft unit test coverage upto 80%" into stable/helium

10 years agoBug 2318: Follow-up changes for previous patch 12535 78/12878/1
tpantelis [Sat, 1 Nov 2014 22:17:33 +0000 (18:17 -0400)]
Bug 2318: Follow-up changes for previous patch 12535

Addressed some comments and other minor changes as a follow-up to patch 12535.

Enhanced the comments in TransactionChainProxy.

Modified Shard to send a failure reply if an runtime exception occurs in
createTransaction. This allows the error to be propagated to the caller
instead of being thrown back to akka.

Modified TransactionChainProxy to throw an IllegalStateException if the
next chain Tx is created before the previous one is readied. Prior, the
Shard would throw an IllegalStateException but from the Future returned
from submit and not on new*Transaction as the API docs state. So this make
it consistent with API contract. This was implemented by introducing a
volatile State field with implemnetations, Idle, Allocated and Closed.

Also, modified TransactionChainProxy to throw TransactionChainClosedException
if the chain is already closed when on Tx create. Again. this makes it
consistent with the API docs.

Added unit tests in DistributedDataStoreIntegrationTest to verify failure
in both cases.

Change-Id: I1b1ed06ceb1d4599f3f6c5443ca24ac1441ac38f
Signed-off-by: tpantelis <tpanteli@brocade.com>
(cherry picked from commit 71a3de6870f23f45b8246a0a476202ebfa9e9ea8)

10 years agoMerge "Bug 2337: Fix Tx already sealed failure on Tx commit" into stable/helium
tpantelis [Sat, 15 Nov 2014 14:13:55 +0000 (14:13 +0000)]
Merge "Bug 2337: Fix Tx already sealed failure on Tx commit" into stable/helium

10 years agoMerge "Bug 2021 - Continuous WARN log nodeConnector creation failed at node: OF|00...
Moiz Raja [Fri, 14 Nov 2014 22:39:18 +0000 (22:39 +0000)]
Merge "Bug 2021 - Continuous WARN log nodeConnector creation failed at node: OF|00:00:xx:xx:xx:xx:xx:xx" into stable/helium

10 years agoBug 2337: Fix Tx already sealed failure on Tx commit 84/12584/2
tpantelis [Sat, 1 Nov 2014 21:55:34 +0000 (17:55 -0400)]
Bug 2337: Fix Tx already sealed failure on Tx commit

Details outlined in bug 2337.

Moved the publishing of the TransactonContext instance in
TransactionFutureCallback#onComplete after the cached operations are
executed.

Also fixed a timing issue in
DistributedDataStoreIntegrationTest#testChangeListenerRegistration that
caused intermittent failures. This was an issue with the test. The
listener registration is done async in the shard so the notification for
the first write commit could occur in the initial notification on
registration which screwed up the test. So I moved the first write
commit before the registration so we expect an initial notification.

Change-Id: Ied2af93be8165208b853c48e57312c3a5acbdaea
Signed-off-by: tpantelis <tpanteli@brocade.com>
10 years agoBUG 2090 : Clustering : Bring akka-raft unit test coverage upto 80% 71/12471/4
Moiz Raja [Thu, 16 Oct 2014 23:51:46 +0000 (16:51 -0700)]
BUG 2090 : Clustering : Bring akka-raft unit test coverage upto 80%

Change-Id: I7b2b16aa42b655e924942f356602c64ccf6d86b7
Signed-off-by: Moiz Raja <moizr@dhcp-10-154-140-127.cisco.com>
10 years agoBUG 2317 : StatisticsManager does not unregister from yang notifications on close 85/12585/2
Moiz Raja [Thu, 6 Nov 2014 22:44:40 +0000 (14:44 -0800)]
BUG 2317 : StatisticsManager does not unregister from yang notifications on close

Change-Id: I9506fda6f3068d1ed047177009542a240f7c0bb4
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBug 2021 - Continuous WARN log nodeConnector creation failed at node: OF|00:00:xx... 28/12828/1
Flavio Fernandes [Thu, 6 Nov 2014 13:22:04 +0000 (08:22 -0500)]
Bug 2021 - Continuous WARN log nodeConnector creation failed at node: OF|00:00:xx:xx:xx:xx:xx:xx

This fixes the bug in ToSalConversionsUtils.actionFrom() that mistakenly
passed an AD-SAL-style NodeID to a conversion utility (fromNodeConnectorRef)
that was expecting a MD-SAL-style NodeID.

Patch 8: Add unit test to exercise code path that exposes the issue

Change-Id: Icc107bd785d6558a3351f139c1b13b8737b56ae7
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Signed-off-by: Colin Dixon <colin@colindixon.com>
10 years agoBUG 2353 : Handle binary, bits and instanceidentifier types in NodeIdentifiers 27/12827/1
Moiz Raja [Wed, 12 Nov 2014 21:10:09 +0000 (13:10 -0800)]
BUG 2353 : Handle binary, bits and instanceidentifier types in NodeIdentifiers

This fix properly serializes and deserializes NodeIdentifier attributes of the types
  - binary (byte[])
  - yanginstanceidentifier
  - bits (set)

Change-Id: I612d40f9730c939be0594496c26370db96ea6449
Signed-off-by: Moiz Raja <moraja@cisco.com>
(cherry picked from commit 2d2f9c82e47c09a09da090e153b084a426e0aa57)

10 years agoBug 2347: DOMConcurrentDataCommitCoordinator uses wrong phase name 11/12811/1
tpantelis [Wed, 12 Nov 2014 16:21:40 +0000 (11:21 -0500)]
Bug 2347: DOMConcurrentDataCommitCoordinator uses wrong phase name

Change-Id: I8b9083a428553525861137fc8630635f6508c2dc
Signed-off-by: tpantelis <tpanteli@brocade.com>
(cherry picked from commit a919cd586f89c7c6877dfaa946cb68ccd5e7a2ef)

10 years agoBUG-2370 Reset schema context on disconnect in nc 09/12809/1
Maros Marsalek [Wed, 12 Nov 2014 17:28:38 +0000 (18:28 +0100)]
BUG-2370 Reset schema context on disconnect in nc

Change-Id: I64197fc4ec375a07b2f0ea1dfb1215c4e31e206c
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
(cherry picked from commit aa14e255d17b0869a1de096cb0048f3c857a4ab0)

10 years agoRe-enable tests and bump aaa version 73/12773/2
Thanh Ha [Wed, 12 Nov 2014 01:04:15 +0000 (20:04 -0500)]
Re-enable tests and bump aaa version

This patch is part 2 of 2 patches:

* Increments the version of the depenency on AAA from 0.1.1-Helium-SR1 to
  0.1.2-SNAPSHOT.
* Re-enables the feature tests for the restconf and netconf-conector
  features.

Change-Id: I2a90aa8e25412186efb75db3b114a353c180e175
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
10 years agoBumping versions by 0.0.1 after the Helium.1 release 11/12711/3
Thanh Ha [Tue, 11 Nov 2014 03:27:37 +0000 (22:27 -0500)]
Bumping versions by 0.0.1 after the Helium.1 release

This patch is part 1 of 2 patches.

* The only version not incrmented is aaa.version, which is left at
  0.1.0-Helium since they depend on controller and can't update yet.
* To break the cyclic dependency, this patch temporarily stops running
  the netconf-connector and restconf feature tests.

A second patch (to be run after AAA increments their versions to
0.1.2-SNAPSHOT) wiil update aaa.version and re-enable these tests.

Change-Id: I70b13d2ad8773e0980a27125665d83b042a91871
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
10 years agoApplying the Helium.1 release patch 10/12710/1 release/helium-sr1
Thanh Ha [Tue, 11 Nov 2014 03:27:00 +0000 (22:27 -0500)]
Applying the Helium.1 release patch

Change-Id: I6f1ad93b193f81ad651238b721ddfe4af491cdfd
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
10 years agoRevert "BUG-2254 Make runtime rpcs in config subsystem/netconf handle context-instanc... 09/12709/1
Thanh Ha [Tue, 11 Nov 2014 03:26:18 +0000 (22:26 -0500)]
Revert "BUG-2254 Make runtime rpcs in config subsystem/netconf handle context-instance attribute with namespaces"

This reverts commit 0cc361a9ef982e7190f8aa8375bf8c141d89f4a0.

Change-Id: I3887f7d24d6aa44a4b9cd3ec1eb12fbb422ee5ec
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
10 years agoRevert "BUG-2254 Enable schema-less rpcs invocation in netconf-connector" 08/12708/1
Thanh Ha [Tue, 11 Nov 2014 03:25:28 +0000 (22:25 -0500)]
Revert "BUG-2254 Enable schema-less rpcs invocation in netconf-connector"

This reverts commit 7ff90e8c7ef06d666888ead8731af94aab1a2c87.

Need to revert for Helium SR1.

Change-Id: If214f52ea883fd59b1893863d0dc0384ac6cc755
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
10 years agoRevert "Merge "Revert "Bug 1764 - added service for pushing default node configuratio... 07/12707/1
Thanh Ha [Tue, 11 Nov 2014 03:24:05 +0000 (22:24 -0500)]
Revert "Merge "Revert "Bug 1764 - added service for pushing default node configuration"" into stable/helium"

This reverts commit 3d26b3152786022cd320a0ff76c613604ca232c9, reversing
changes made to 7ff90e8c7ef06d666888ead8731af94aab1a2c87.

Need to revert for Helium SR1.

Change-Id: I853cc600852d36d780bf4c059873494dad15641c
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
10 years agoMerge "Revert "Bug 1764 - added service for pushing default node configuration""...
Tony Tkacik [Mon, 10 Nov 2014 16:46:05 +0000 (16:46 +0000)]
Merge "Revert "Bug 1764 - added service for pushing default node configuration"" into stable/helium

10 years agoRevert "Bug 1764 - added service for pushing default node configuration" 21/12421/3
michal rehak [Fri, 31 Oct 2014 18:18:46 +0000 (18:18 +0000)]
Revert "Bug 1764 - added service for pushing default node configuration"

- API change prevention

This reverts commit 3fd8589beb4ffb6caf54c85616d3b4b13956ac9d.

Change-Id: I1d72b91c8c9fc2250b774c14dac5daea7abae691
Signed-off-by: Michal Rehak <mirehak@cisco.com>
10 years agoBUG-2254 Enable schema-less rpcs invocation in netconf-connector 73/12673/1
Maros Marsalek [Mon, 10 Nov 2014 13:20:52 +0000 (14:20 +0100)]
BUG-2254 Enable schema-less rpcs invocation in netconf-connector

Change-Id: Id84a2be3db050a546380186c79deadf5c9f7fd28
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoBUG 2155 - depth parameter in URI 29/12229/8
Jozef Gloncak [Fri, 24 Oct 2014 08:34:06 +0000 (10:34 +0200)]
BUG 2155 - depth parameter in URI

For stable/helium branch.

- CutDataToCorrectDepth - test of various depth levels for JSON and XML
- NormalizedNodeContext - added attribute with required depth.
- RestGetOperationTest - commented test was moved to CutDataToCorrectDepth
- JsonNormalizedNodeBodyReader - added code for derivation of parent schema
node for specified schemanode (to be used as input parameter of
JsonParserStream)
- NormalizedNodeJson(Xml)BodyWriter - added depth parameter among input
parameters of NormalizedNodeWriter.forStreamWriter() method.
- XmlNormalizedNodeBodyReader - added branch for parsing with using of
  UnkeyedListEntryNodeParser for case when top level node in xml input is
  unkeyed list entry.

WARNING!!!
Following patches should be merged first (else build will fail)
- BUG 1975 patch set should be merged because test CutDataToCorrectDepthTest will
  fail (fox xml are tested cases where UnkeyedListNode is incorrectly loaded
  as MapNode and test fails)
- BUG 2279 pat set should be merged because test CutDataToCorrectDepthTest
  will fail (currently input with top level element list entry data is
  processed:
  -- JSON - top level element is list node
  -- XML - top level element is list entry node)

Remark:
 - JSON part of CutDataToCorrectDepthTest is commented see remark in code

Change-Id: I4c3b97380293ab24155faadda7633c6e0a71fcec
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
10 years agoBug 2233 - RPC register exception when rpc has no input 95/12595/1
Jan Hajnar [Fri, 31 Oct 2014 12:59:08 +0000 (13:59 +0100)]
Bug 2233 - RPC register exception when rpc has no input

* added check that should prevent non routed Rpcs being treated as
routed and and failing at context resolution.

Change-Id: I281152879429f2020f48894753f1d57aea85bde6
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
(cherry picked from commit 170bc1beb43f8082570d066afe6dbd2bf5c3735e)

10 years agoBUG-2254 Make runtime rpcs in config subsystem/netconf handle context-instance attrib... 92/12592/1
Maros Marsalek [Wed, 5 Nov 2014 13:29:55 +0000 (14:29 +0100)]
BUG-2254 Make runtime rpcs in config subsystem/netconf handle context-instance attribute with namespaces

Change-Id: I9ca4accdb10ba5a6b52ce9b8f7ad02a8cbe8743d
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
10 years agoBug 2328: Change ensureParent algorithm. 44/12544/1
Tony Tkacik [Thu, 6 Nov 2014 09:18:23 +0000 (10:18 +0100)]
Bug 2328: Change ensureParent algorithm.

EnsureParents algorithm has two different implementations
with small buggy differences in behaviour - one was used in
Legacy API always used merge operation for each and every
parent node and also user written node.

New Data Broker API implementation used algorithm which
used merge operation only for nodes, which did not existed
in transaction, but this triggered createParents=true
to fail, if parent node was deleted in concurrent transaction
which finished earlier.

Unified this implementations into one in abstract class:
merge is used always for each parent node, except
writen node which is already supplied by client of API.

New algorithm does not need to do read from transaction
which makes this transaction faster during creation time,
but with smaller performance penalty at commit time.

Change-Id: I0fb9f8d4e77648739673566729984e1ecb1e5146
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
10 years agoBug 2318: Ensure previous Tx in chain is readied before creating the next 37/12537/1
tpantelis [Sat, 1 Nov 2014 08:10:20 +0000 (04:10 -0400)]
Bug 2318: Ensure previous Tx in chain is readied before creating the next

In TransactionChainProxy, subclassed TransactionProxy (ChainedTransactionProxy)
to hook into the TransactionProxy to capture the cohort Futures on ready
and to customize the returned create shard Tx Future.

The previous Tx's ready Futures are captured and cached in the enclosing
TransactionChainProxy instance. When the client creates the next Tx in
the chain, the Future from the shard Tx create message is wrapped by a
sequence Future that combines all the previous ready Futures. Thus, when
the previous ready Futures complete, the shard Tx create is sent and
that Future is used to complete the returned Promise.

Change-Id: If002e4d705510aee3f560c506318d25f386768e5
Signed-off-by: tpantelis <tpanteli@brocade.com>
10 years agoMerge "Fix Bug 2290 (try #2)" into stable/helium
Ed Warnicke [Wed, 5 Nov 2014 20:42:59 +0000 (20:42 +0000)]
Merge "Fix Bug 2290 (try #2)" into stable/helium

10 years agoBUG 2325 : Value type of byte[] not recognized by the NormalizedNodeSerializer 28/12528/4
Moiz Raja [Wed, 5 Nov 2014 19:09:06 +0000 (11:09 -0800)]
BUG 2325 : Value type of byte[] not recognized by the NormalizedNodeSerializer

Change-Id: I16eab6cdbf7712624f2c1fafb5bf41107b6ae379
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoFix Bug 2290 (try #2) 30/12530/1
Ryan Moats [Wed, 5 Nov 2014 19:49:53 +0000 (13:49 -0600)]
Fix Bug 2290 (try #2)

Ensure that isIPInUse, getLowAddr, allocateIP, releaseIP,
gatewayIP_Pool_overlap and initDefaults are all V6 friendly.

Manual rebase to fix author's abject stupidity...

Change-Id: I5a136e337672f4ad1b71aa42a3fd33a4e5a85aa2
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
10 years agoMerge "Fix intermittent failure in DataChangeListenerTest" into stable/helium
Moiz Raja [Mon, 3 Nov 2014 18:59:10 +0000 (18:59 +0000)]
Merge "Fix intermittent failure in DataChangeListenerTest" into stable/helium

10 years agoMerge "Cherry Pick of 12340 to stable/helium branch" into stable/helium
Devin Avery [Mon, 3 Nov 2014 17:00:36 +0000 (17:00 +0000)]
Merge "Cherry Pick of 12340 to stable/helium branch" into stable/helium

10 years agoFix intermittent failure in DataChangeListenerTest 63/12463/1
tpantelis [Fri, 31 Oct 2014 06:12:10 +0000 (02:12 -0400)]
Fix intermittent failure in DataChangeListenerTest

Fixed an intermittent failure in testDataChangedWithNoSender due to timing if a
DeadLetter is received due to the Monitor message being dropped as the
unit tests don't set up the termination monitor actor. The test expects
no DeadLetter for DataChangedReply so added chanhes to ignore
DeadLetters for other messages.

Change-Id: I39ddc888de7fbff9201ac9f785baa6fec7cb8f2c
Signed-off-by: tpantelis <tpanteli@brocade.com>
10 years agoCherry Pick of 12340 to stable/helium branch 61/12461/1
Ryan Moats [Mon, 3 Nov 2014 16:02:45 +0000 (10:02 -0600)]
Cherry Pick of 12340 to stable/helium branch

Fixes Bug 2290

Change-Id: I8d1dc4b2b26326e2ebeb7cc9b21b42085d61829c
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
10 years agoBUG 2296 : TransactionProxy should support the ability to accept a local TPC actor... 50/12450/4
Moiz Raja [Sun, 2 Nov 2014 16:14:03 +0000 (08:14 -0800)]
BUG 2296 : TransactionProxy should support the ability to accept a local TPC actor path

In Helium when the ShardTransaction processes a Ready message it sends back a the path of a ThreePhaseCommitCohort actor in the ReadyReply. This path is actually a local actor path, this local actor path is then converted into a remote path by the TransactionProxy.

The fix for Bug 1607 breaks this capability which is required to support forward compatibility in a cluster where a transaction request originates in a node that has been upgraded to Helium-1 and the actual transaction is happening on a node which has not yet been upgraded to Helium-1.

Change-Id: I857384bdd61b3492ea270dcf04d14883811c37c2
Signed-off-by: Moiz Raja <moraja@cisco.com>
10 years agoBug 2294: Handle Shard backwards compatibility 49/12449/1
tpantelis [Thu, 30 Oct 2014 11:30:32 +0000 (07:30 -0400)]
Bug 2294: Handle Shard backwards compatibility

Implemented as outlined in Bug 2294.

Change-Id: I14aa8ef5f320f9d165492396ece4ea63cce9b0c3
Signed-off-by: tpantelis <tpanteli@brocade.com>
10 years agoBug 2134: Fix intermittent RaftActorTest failure 36/12436/1
tpantelis [Wed, 29 Oct 2014 16:05:05 +0000 (12:05 -0400)]
Bug 2134: Fix intermittent RaftActorTest failure

We need to wait for akka's recovery to complete before we perform our
tests as akka's recovery runs async and may interfere with our tests and
cause them to fail if the timing is right. This was seen once on
jenkins.

Change-Id: Ia748d17f662d64235881005e6522441b384c78ea
Signed-off-by: tpantelis <tpanteli@brocade.com>
10 years agoMerge "Bug 1764 - added service for pushing default node configuration" into stable...
Tony Tkacik [Fri, 31 Oct 2014 12:10:28 +0000 (12:10 +0000)]
Merge "Bug 1764 - added service for pushing default node configuration" into stable/helium