7 years agoFix issues when persistence enabled 21/44521/3
Tom Pantelis [Mon, 22 Aug 2016 21:32:59 +0000 (17:32 -0400)]
Fix issues when persistence enabled

When persistence is dynamically enabled, we start persisting subsequent log
entries which causes issues on restart due to a gap in journal indexes. We need to
persist a snapshot with the current state to avoid this.

Also if persistence is disabled, we still persist ReplicatedLogEntry instances that
have a PersistentPayload, of which ServerConfigurationPayload is currently the only one.
This also can cause gaps in the persisted journal indexes which cause issues if
persistence is later enabled. To avoid this, we really shouldn't persist
ReplicatedLogEntry instances at all if data persistence is disabled since we don't
add them to the in-memory journal on recovery anyway - we just recover and apply the
ServerConfigurationPayload. Instead we should persist just the

Change-Id: Ief78d68423b33aac1649220a36d32ff50f493eb7
Signed-off-by: Tom Pantelis <>
7 years agoTurn off visibility of GlobalBundleScanningSchemaServiceImpl#start() 49/44549/1
Alexis de Talhouët [Tue, 23 Aug 2016 12:26:32 +0000 (08:26 -0400)]
Turn off visibility of GlobalBundleScanningSchemaServiceImpl#start()

Since the start() method is only used in the createInstance(), it
should be private and not exposed.

Change-Id: I0264d0a66bbfb2536bc4d6c57f27f15584ddfabb
Signed-off-by: Alexis de Talhouët <>
7 years agoRevert "Fix feature config pusher warning" 16/44516/1
Tom Pantelis [Mon, 22 Aug 2016 20:05:42 +0000 (16:05 -0400)]
Revert "Fix feature config pusher warning"

This reverts commit 64e760caf2a5d223cca7598b3ff8941ac37c7a96. Unfortunately some projects don't follow the convention of installing their CSS xml files under etc/opendaylight/karaf.

Change-Id: I6194035399eddc1d66cadaa7f9b0964b9a46d92b
Signed-off-by: Tom Pantelis <>
7 years agoFix feature config pusher warning 85/44185/2
Tom Pantelis [Wed, 17 Aug 2016 17:12:31 +0000 (13:12 -0400)]
Fix feature config pusher warning

The feature config pusher assumes config files installed by features
that have XML extension are CSS files and tries to parse them. On failure
it prints a warning but ignores it and moves on. Up till now we've only
had CSS XML files but we now have XML files related to the
clustered-app-config. To avoid the warning I added an additional check
for "opendaylight/karaf" present in the file path. To be complete we would
open the file and inspect the first element but I didn't think that was worth
the effort since all current CSS files are put under opendaylight/karaf and
ODL is moving away from CSS.

Change-Id: I1f0dcda9efa14db330a72e455fe4756c8fbfcaab
Signed-off-by: Tom Pantelis <>
7 years agoMake DataTreeCandidatePayload MigratedSerializable 09/44109/2
Robert Varga [Tue, 16 Aug 2016 22:44:41 +0000 (00:44 +0200)]
Make DataTreeCandidatePayload MigratedSerializable

This class has been superseded and we want to purge it from
everywhere. Mark it as MigratedSerializable, which will trigger
a snapshot to be taken.

Change-Id: I1613d3cc2c359296718a20a4263ba848259f46d3
Signed-off-by: Robert Varga <>
7 years agoTake snapshot after recovery on migrated messages 47/43747/8
Tom Pantelis [Thu, 11 Aug 2016 01:19:59 +0000 (21:19 -0400)]
Take snapshot after recovery on migrated messages

Modified RaftActorRecoverySupport to capture and persist a snapshot
after recovery when there are migrated messages recovered. It utilizes
the new MigratedSerializable interface.

I also created equivalent classes in the persisted packages for
UpdateElectionTerm, DeleteEntries and ApplyJournalEntries that implement
MigratedSerializable and use the Externalizable proxy pattern. The
existing classes were deprecated and readResolve to the new classes.

Change-Id: Ia2e664de9ffd59991c49160424b13bc8ca0bfcbf
Signed-off-by: Tom Pantelis <>
7 years agoFix FinalModifierException due to BindingToNormalizedNodeCodec final 74/44274/2
Tom Pantelis [Thu, 18 Aug 2016 14:31:00 +0000 (10:31 -0400)]
Fix FinalModifierException due to BindingToNormalizedNodeCodec final

The BindingToNormalizedNodeCodec class is final which prevents blueprint from
being able to create a proxy instance when advertising as a service. This is
is OK as it will use the actual instance but it logs an exception:

2016-08-11 23:03:18,215 | INFO  | rint Extender: 2 | ServiceRecipe
| 15 - org.apache.aries.blueprint.core - 1.6.1 | Unable to create a
proxy object for the service .component-2 defined in bundle
org.opendaylight.controller.sal-binding-broker-impl/1.5.0.SNAPSHOT with
id. Returning the original object instead.
org.apache.aries.proxy.FinalModifierException: The class
is final.

Although it's logged at INFO level we should avoid it.

Changing BindingToNormalizedNodeCodec to non-final fixes the exception however it causes
an error when it tries to create the proxy b/c some methods are final. To avoid this, weneed to avoid the proxy creation altogether so I added a method to
BindingToNormalizedNodeCodecFactory to advertise the OSGi service instead of using
the blueprint <service> element.

Note: it's not good practice to advertise a service with the actual class but it's
needed with BindingToNormalizedNodeCodec for backwards compatibility with CSS modules
that inject the BindingToNormalizedNodeCodec instance and not its interfaces. The
BindingToNormalizedNodeCodec CSS service identity is deprecated and will/should go away in the future.

Change-Id: I96b6cb8b030de39808de17142d79f8bbd09bf735
Signed-off-by: Tom Pantelis <>
7 years agoBug 6278: Move opendaylight-karaf-empty to odlparent 77/44077/4
Ryan Goulding [Tue, 9 Aug 2016 21:00:26 +0000 (17:00 -0400)]
Bug 6278: Move opendaylight-karaf-empty to odlparent

Move opendaylight-karaf-empty from controller to odlparent. As with
moves of other artifacts, the following process will happen:

1) Copy opendaylight-karaf-empty into odlparent and adjust the groupId.
   The patch that handled the copy work is:

2) Change opendaylight-karaf-empty in controller to derive from odlparent's
   opendaylight-karaf-empty.  This is handled in this patch.

3) Change references to use the artifact added in #1.

4) Deprecate and remove controller's opendaylight-karaf-empty.

This patch just handles #2, re-parenting the existing controller
opendaylight-karaf-empty such that it derives from odlparent's
opendaylight-karaf-empty (added in #1).

Change-Id: Ifbfedd8a06f5f03900277d005906af83220707cc
Signed-off-by: Ryan Goulding <>
7 years agoDataBrokerTestModule: use AbstractDataBrokerTest without inheritance 45/43645/3
Michael Vorburger [Wed, 10 Aug 2016 15:22:30 +0000 (17:22 +0200)]
DataBrokerTestModule: use AbstractDataBrokerTest without inheritance

While starting to write JUnit tests (for functional components) with the
AbstractDataBrokerTest, I found myself not liking its design which
forces one to use a class SomeTest extends AbstractDataBrokerTest...

Modern JUnit tests should be written by composition, not enforced
inheritance.  Thus this new DataBrokerTestModule allows one to obtain a
DataBroker suitable for Tests from anywhere.

The *(Test)Module naming convention is obviously inspired by a DI point
of view (think Spring Framework's @Configuration classes, or Google
Guice or Dagger (yay!) *Module classes - which is exactly what this
really is - a particular way to obtain an instance of an
implementationof some service (here a DataBroker) in a certain
environment (here for tests).

The internal implementation of DataBrokerTestModule could be changed
later; I guess ideally what's in AbstractDataBrokerTest could go into
DataBrokerTestModule and AbstractDataBrokerTest could use it, but for
now I'm too lazy to change that, as this does the trick nicely.  Later
implementation changes would be transparent to users of

Change-Id: I9641f527bbc0cb92732f2e513cdd64cc6a837200
Signed-off-by: Michael Vorburger <>
7 years agoLimit visibility of ShardDataTree methods 06/43006/12
Robert Varga [Wed, 3 Aug 2016 00:13:36 +0000 (02:13 +0200)]
Limit visibility of ShardDataTree methods

Reduce visibility to package-private and add
@VisibleForTesting where this is not possible.

Some of the methods are not converted, as they are used
by the EOS implementation.

Change-Id: Ie7472fec4439e69479d097520fd81be9ea16a88c
Signed-off-by: Robert Varga <>
7 years agoBUG-865: remove String-based getDataChildByName() 88/43588/3
Martin Ciglan [Wed, 10 Aug 2016 08:58:08 +0000 (10:58 +0200)]
BUG-865: remove String-based getDataChildByName()

This is follow-up patch to reflect Yangtools changes
and needs to be merged after

Change-Id: Icb66e8096cb77589de3ee89a87917a528e8d0dc0
Signed-off-by: Martin Ciglan <>
7 years agoAddress review comments 75/43775/2
Tom Pantelis [Fri, 12 Aug 2016 06:00:36 +0000 (02:00 -0400)]
Address review comments


Change-Id: If054abf5dce4207fe536beeef15ffaad61b63074
Signed-off-by: Tom Pantelis <>
7 years agoBUG-5280: fix compilation after unrebased merge 78/43778/1
Robert Varga [Fri, 12 Aug 2016 12:03:54 +0000 (14:03 +0200)]
BUG-5280: fix compilation after unrebased merge

Merging the last batch of patches resulted in a mismatch
between newly-introduced tests and method movement. Fix
that up.

Change-Id: I326ad06ff07b902987e397f13f8b0afdb8c45231
Signed-off-by: Robert Varga <>
7 years agoBUG-5280: add maxMessages field to ConnectClientSuccess 28/43328/9
Robert Varga [Mon, 8 Aug 2016 14:31:44 +0000 (16:31 +0200)]
BUG-5280: add maxMessages field to ConnectClientSuccess

This field will act as a hint on how many messages may
be queued by the frontend towards the backend at any
given time.

Change-Id: Ibb8bbe2af9595bc0ecee090acea35aa78a9250b7
Signed-off-by: Robert Varga <>
7 years agoBUG-5280: add FrontendMetadata 24/43124/15
Robert Varga [Wed, 3 Aug 2016 00:52:20 +0000 (02:52 +0200)]
BUG-5280: add FrontendMetadata

This patch adds the frontend tracking abilities for followers.
It also defines the corresponding ShardDataTreeSnapshotMetadata
for use with persistence.

Change-Id: I7e2c6755c3389dcb5284f17a9c6076fb9e7ac95e
Signed-off-by: Robert Varga <>
Signed-off-by: Vaclav Demcak <>
7 years agoBUG-5280: persist metadata in snaphots 74/42974/19
Robert Varga [Mon, 1 Aug 2016 21:20:11 +0000 (23:20 +0200)]
BUG-5280: persist metadata in snaphots

This patch adds the wiring in ShardDataTree to persist
various pieces of metadata in a snapshot. It also includes
metadata recovery from a snapshot.

In order to make this work, this patch centralizes all
actual payload and snapshot handling within the ShardDataTree
by introducing explicit entrypoints for each avenue through
which data can be introduced.

Change-Id: Ibc15bd152bd44dd583d67bb7fc61bc8f3086df30
Signed-off-by: Robert Varga <>
7 years agoBUG-5280: split out cds akka client substrate 21/43321/9
Robert Varga [Mon, 8 Aug 2016 13:54:20 +0000 (15:54 +0200)]
BUG-5280: split out cds akka client substrate

This patch splits out the baseline frontend client
into a separate package.

Change-Id: I2d8ca8b81f29a45dd8c30f3bef467fcda94d4887
Signed-off-by: Robert Varga <>
7 years agoMove MessageTrackerTest 22/43322/7
Robert Varga [Mon, 8 Aug 2016 14:13:42 +0000 (16:13 +0200)]
Move MessageTrackerTest

This moves the test to sal-clustering-commons, so we end
up testing in its home artifact.

Change-Id: Ie001bee6de92381ab6140a3a54e31c854a46ae1d
Signed-off-by: Robert Varga <>
7 years agoBug 5450: Query akka cluster state on Follower ElectionTimeout 65/43265/6
Tom Pantelis [Fri, 5 Aug 2016 20:10:58 +0000 (16:10 -0400)]
Bug 5450: Query akka cluster state on Follower ElectionTimeout

Added changes to query the akka ClusterState to see if the leader is
actually unreachable or not Up on ElectionTimeout. If not, Follower
reschedules election timer and stays as Follower.

Change-Id: I3a054a82edbe975ad9e27c4d208083b19b392d2d
Signed-off-by: Tom Pantelis <>
7 years agoChange InstallSnapshot and reply to use Externalizable Proxy 38/42638/4
Tom Pantelis [Tue, 26 Jul 2016 22:36:06 +0000 (18:36 -0400)]
Change InstallSnapshot and reply to use Externalizable Proxy

This makes InstallSnapshot cleaner with no public no-arg constructor.

I also removed the InstallSnapshot protobuff message. In addition,
SerializableUtils is no longer needed as there's no more protobuff

Change-Id: I17aa4f7195cf09b798daee5587bbf50ccbc4bff0
Signed-off-by: Tom Pantelis <>
7 years agoBUG-6111: fix a thinko 28/43628/1
Robert Varga [Wed, 10 Aug 2016 09:24:31 +0000 (11:24 +0200)]
BUG-6111: fix a thinko

Failure to initialize isOpen leads to the codepath never being

Change-Id: I20f1b76c9ada581edc1c92c61447fd97d0d1b2ea
Signed-off-by: Robert Varga <>
(cherry picked from commit 01ca6a43914fb8dd27a24da7476b835fc2570e40)

7 years agoMove ServerConfigurationPayload to cluster.raft.persisted 66/43266/7
Robert Varga [Fri, 5 Aug 2016 17:44:14 +0000 (19:44 +0200)]
Move ServerConfigurationPayload to cluster.raft.persisted

This introduces its mirror copy and modifies the old class
so that it readResolve()s to the new class. It also adjusts
all users to use the new class.

The new class uses Externalizable proxy pattern to allow the
class itself be evolved without breaking compatibility. Also
NoOpPayload is retrofitted this way, which makes all subclasses
of Payload not have their serialization format tied to Payload

Change-Id: I26010a9e1438dbc4cb1822e1c4dbb51e2b6e538e
Signed-off-by: Robert Varga <>
7 years agoBug 6278: Switch to use odlparent's karaf-parent 44/43144/3
Ryan Goulding [Thu, 4 Aug 2016 09:24:19 +0000 (05:24 -0400)]
Bug 6278: Switch to use odlparent's karaf-parent

Switch archetypes so they lay down the correct karaf-parent implementation.

Change-Id: Ib9aa057f45141579a0d2bc895d373bd2882f975c
Signed-off-by: Ryan Goulding <>
7 years agoBump ietf versions to ...10-SNAPSHOT 40/43540/2
Thanh Ha [Tue, 9 Aug 2016 17:43:50 +0000 (13:43 -0400)]
Bump ietf versions to ...10-SNAPSHOT

Bump versions according to:

Change-Id: I3038eaf68217d131bf867b1fcb2abb3abbf76663
Signed-off-by: Thanh Ha <>
7 years agoBug 6348 : car:stop-stress-test RPC to return success & failure counters 59/43259/5
Sai MarapaReddy [Tue, 19 Jul 2016 20:49:21 +0000 (13:49 -0700)]
Bug 6348 : car:stop-stress-test RPC to return success & failure counters

Current RPC car:stop-stress-test doesn't return how many
cars are created or failed. Adding success and failure counters
will help user to determine the number of cars created or failed
during the the process of creation of car tests using
car:stress-test. This patch enhances car:stop-stress-test RPC.

Change-Id: Iff054c8210ce49f06b4fa96ca5a437d9b82deddb
Signed-off-by: Sai MarapaReddy <>
Author: Sai MarapaReddy <>

7 years agoFix ietf-yang-types version 68/43468/1
Thanh Ha [Tue, 9 Aug 2016 04:54:26 +0000 (00:54 -0400)]
Fix ietf-yang-types version

The version bump script messed up bumping the ietf version. Fixing it
with this patch.

Change-Id: I9b3975582a3a2fe35ab5f4509b6d3a70bf5ca243
Signed-off-by: Thanh Ha <>
7 years agoFix relative paths for mdsal-it-parent 64/43464/1
Anil Belur [Tue, 9 Aug 2016 01:39:55 +0000 (11:39 +1000)]
Fix relative paths for mdsal-it-parent

Change-Id: Id321a86500216a8cf0ebe5ce7ebb698717996c7c
Signed-off-by: Anil Belur <>
7 years agoBump versions by 0.1.0 for next dev cycle 09/43409/1
Thanh Ha [Mon, 8 Aug 2016 21:50:13 +0000 (17:50 -0400)]
Bump versions by 0.1.0 for next dev cycle

Change-Id: I9c4a4b1e6d0e101392fb19dc68f814e30de4fa5c
Signed-off-by: Thanh Ha <>
7 years agoBUG-6111: implement PingPongTransactionChain cancelation 58/43058/3
Robert Varga [Wed, 3 Aug 2016 15:15:57 +0000 (17:15 +0200)]
BUG-6111: implement PingPongTransactionChain cancelation

This patch implements transaction cancelation in PingPongDataBroker,
which has slightly different semantics -- if a transaction is canceled
while being in a batch, proper isolation of the batch is maintained
and after preceding batch completes, the transaction chain is aborted.

Since there is no transaction isolation within a batch, this is the
only course of action we can take.

Change-Id: I0058503165dbfba8748a17a9ef9272265f4bc1c9
Signed-off-by: Robert Varga <>
7 years agoAdd PMD exclusion for config-generated files 42/43242/2
Robert Varga [Fri, 5 Aug 2016 15:09:31 +0000 (17:09 +0200)]
Add PMD exclusion for config-generated files

Unfortunately PMD does not support wildcard
root exclusions, hence we have to match odlparent
configuration and extend it.

Change-Id: I4bc7a1b8c25b75cb5b348fb2a16f0e5b2c111359
Signed-off-by: Robert Varga <>
7 years agoBug 5504: Add PreLeader raft state 28/42728/4
Tom Pantelis [Wed, 27 Jul 2016 19:52:53 +0000 (15:52 -0400)]
Bug 5504: Add PreLeader raft state

The following scenario can result in a "store tree and candidate base
differ" IllegalStateException on commit:

A follower receives a replicate and adds it to the log, say at index 1,
but the leader transfers or dies before committing and applying it to the
state. The follower becomes leader and when the next tx is applied, log
index 2, it has to first apply all log entries from the previous term that
hadn't been committed yet, in this case index 1. Since we got consensus for
index 2 that means index 1 has also been replicated to a majority. Therefore
ApplyState is sent for index 1 and then index 2. However index 1 is applied
as a "foreign" candidate while index 2 is in the pre-commit state. When
index 2 is applied the commit fails.

To prevent this scenario, we introduce a new raft state, PreLeader,
which is transitioned to from Candidate if there are uncommitted
entries, ie commit index < last log index. The PreLeader state performs all
the duties of Leader with the added behavior of attempting to commit all
uncommitted entries from the previous leader's term. Raft does not allow a
leader to commit entries from a previous term by simply counting replicas -
only entries from the leader's current term can be committed (§5.4.2). Rather
then waiting for a client interaction to commit a new entry, the PreLeader
state immediately appends a no-op entry (NoopPayload) to the log with the
leader's current term. Once the no-op entry is committed, all prior entries
are committed indirectly. Once all entries are committed, ie commitIndex matches
the last log index, it switches to the normal Leader state.

The PreLeader state is considered an inactive leader state and thus
client transactions are delayed until it transitions to Leader.

Change-Id: I20a541de0eba9b0075b9952dc6d5808943b7bb8f
Signed-off-by: Tom Pantelis <>
7 years agoBUG-5280: expand ShardDataTree to cover transaction mechanics 97/42497/27
Robert Varga [Mon, 25 Jul 2016 18:59:37 +0000 (20:59 +0200)]
BUG-5280: expand ShardDataTree to cover transaction mechanics

A chunk of ShardCommitCoordinator should actually be implemented
by ShardDataTree. This includes transaction queueing, commit timers,
interaction with user cohorts and persistence.

This patch implements the relevant operations in an message-agnostic,
callback-driven way.

Fix: ShardDataTreeTest (missing ShardStat MBean)

Change-Id: I353bacce8245df85c5f4d6b4cc0ce5416f2f0337
Signed-off-by: Robert Varga <>
Signed-off-by: Vaclav Demcak <>
Signed-off-by: Tom Pantelis <>
7 years agoFix relativePath declaration 60/43060/2
Robert Varga [Wed, 3 Aug 2016 16:03:01 +0000 (18:03 +0200)]
Fix relativePath declaration

Since karaf-parent's parent is outside of controller,
relativePath has to be empty.

Change-Id: I491c73f2d42b8d5f3e159625f8ba01fdadd32497
Signed-off-by: Robert Varga <>
7 years agoReturn shortened string from TransactionIdentifier.toString 14/42314/3
Tom Pantelis [Fri, 22 Jul 2016 01:30:36 +0000 (21:30 -0400)]
Return shortened string from TransactionIdentifier.toString

For debug logging we need a shortened string for better readability and
grepping. The standard toString is way too long. I changed toString to a
similar compact form that we had before. adding in the frontend generation id
and type, eg


Change-Id: I942eaaa0e8ceedf42eed964f2a2e3a76d8c09806
Signed-off-by: Tom Pantelis <>
7 years agoEnable akka WeaklyUp feature 99/42799/3
Tom Pantelis [Fri, 29 Jul 2016 18:33:27 +0000 (14:33 -0400)]
Enable akka WeaklyUp feature

By enabling allow-weakly-up-members, akka will allow new nodes to join a
cluster if there are unreachable nodes. However, this only pertains to
new nodes that weren't previously in the cluster. Unfortunately it
doesn't pertain to node restarts where a node was in the cluster then
attempts to re-join with a new incarnation, which is what we really want.
Despite that, it will at least work for new nodes so I think it's worth
enabling. Akka might be further enhanced to broaden WeaklyUp to include
new incarnations (there's requests for that).

I also changed the ShardManager to handle MemberWeaklyUp events in
the same manner as MemberUp.

Change-Id: I5cf6c1967162b8a9bc6ffb59d34a50560699e4ca
Signed-off-by: Tom Pantelis <>
7 years agoBug 6278: Copy karaf-parent from controller to odlparent 49/42649/5
Ryan Goulding [Fri, 22 Jul 2016 07:52:08 +0000 (03:52 -0400)]
Bug 6278: Copy karaf-parent from controller to odlparent

As discussed in the MD-SAL call, there is an architectural need to move
karaf-parent from the controller project to the odlparent project.  This
is particularly useful for karaf upgrades, since right now a bump in karaf
version within odlparent requires a rebuild of controller to reflect the
change in karaf-parent, and our build jobs are not set up to support such
a process.

The move process will be handled in multiple steps:

1) Copy karaf-parent, karaf-branding and opendaylight-karaf-resources to
odlparent.  All three of these should belong in odlparent.  All three must
be moved since karaf-parent depends on the latter two artifacts.  Since
controller depends on odlparent (and not the other way around), they must
be moved upstream to odlparent.

2) Have controller's karaf-parent derive from odlparent's karaf-parent.
This preserves the ability for downstream consumers to derive from the
controller karaf-parent in the interim, while allowing changes to odlparent's
karaf-parent to be recognized since controller does not need to be rebuilt.

This also involves removing karaf-branding and opendaylight-karaf-resources
from the controller project, since they are no longer needed.  There are two
consumers that need to be patched:

3) Change all downstream projects to utilize odlparent's karaf-parent.  This
is future work and will be done in several patches.

4) Remove controller's karaf-parent once we feel all downstream consumers
are using the odlparent's karaf-parent.

Change-Id: Ib42ff5212bbfb93883346a19855544df4fb06d61
Signed-off-by: Ryan Goulding <>
7 years agoDo not use ShardDataTree in PruningDataTreeModificationTest 75/42975/5
Robert Varga [Tue, 2 Aug 2016 13:33:25 +0000 (15:33 +0200)]
Do not use ShardDataTree in PruningDataTreeModificationTest

This test requires on a DataTree, hence use that.

Change-Id: I37697121f6686cdfe6b1d71ca87ff79281619532
Signed-off-by: Robert Varga <>
7 years agoBUG-5280: add client connect messages 66/42866/7
Robert Varga [Sun, 31 Jul 2016 21:55:28 +0000 (23:55 +0200)]
BUG-5280: add client connect messages

When a frontend is attempting to re-establish communication
with the backend it sends its coordinates and various other
information to a backend.

Sending ConnectClientRequest initiates a handshake, to which
the backend will respond either with a failure, or with an
adjusted ConnectClientSuccess.

Change-Id: I58ba9a2103f80e528654222f82f07416f7d7815e
Signed-off-by: Robert Varga <>
7 years agoHandle DeleteSnapshots response messages 00/42800/3
Tom Pantelis [Fri, 29 Jul 2016 19:23:23 +0000 (15:23 -0400)]
Handle DeleteSnapshots response messages

This is a follow-up to
I didn't think deleteSnapshots returned a response but it does - I see
a warning for unhandled DeleteSnapshotsSuccess. I added handling for
DeleteSnapshotsSuccess and DeleteSnapshotsFailure. For the latter I log
a warning but don't fail the actor.

Change-Id: Ibb41e5124eb22530f98a5ef958abffc556dea4cf
Signed-off-by: Tom Pantelis <>
7 years agoFix missing LeaderStateChanged event 97/42597/4
Tom Pantelis [Tue, 26 Jul 2016 15:55:09 +0000 (11:55 -0400)]
Fix missing LeaderStateChanged event

In RaftActor, the logic to detect a leader state change compares the last
valid leader Id with the current behavior leader Id. Consider the
following leader Id change sequence:

  "member-1" -> null (goes leaderless)
  null -> "member-1" (member-1 becomes leader again)

The first state change will send a LeaderStateChanged event to the
ShardManager with null leader Id causing the ShardManager to clean its
primary shard info cache. However for the second state change, no
LeaderStateChanged event is sent b/c the new leader Id is the same as
the last valid/non-null leader Id. Therefore transactions fail due to no
shard leader.

I changed it to use the last leader Id (null or not) for the comparison
so every state change is detected.

Change-Id: I060872d4712e040b60acfc998914b394a40943af
Signed-off-by: Tom Pantelis <>
7 years agoImprove leader election convergence 69/42969/3
Tom Pantelis [Tue, 2 Aug 2016 02:23:33 +0000 (22:23 -0400)]
Improve leader election convergence

When 2 nodes startup with the first node's log behind the second node's,
it usually takes several election rounds to converge - I've seen
anywhere from 40 s to 3 min, depending on timing. What happens is that
the first node goes to Candidate first but it's RequestVote is rejected
by the seconds node. Shortly after the seconds node goes to Candidate -
the term is higher than the first which causes the first node to go back
to Follower. However it doesn't respond to the RequestVote. Then the
first node goes to Candidate and the cycle repeats. Eventually, due to
the election variance, the seconds node times out first and the second
node process the RequestVote and grants it. But it can take more than 10

We can improve the convergence by allowing a Candidate to process and
respond to RequestVote when the sender's term is greater. It still
transitions to Follower as per the raft rules. The raft paper does not
say whether or not a Candidate can/should process a RequestVote in this
case but it seems to make sense. With this change, the first RequestVote
sent by the second node is granted and it converges quickly.

Change-Id: If9416ddf7bf0dfc1220a169be4174f440626a0dd
Signed-off-by: Tom Pantelis <>
7 years agoAlleviate premature elections in followers 64/42564/7
Tom Pantelis [Tue, 26 Jul 2016 04:07:02 +0000 (00:07 -0400)]
Alleviate premature elections in followers

If a follower actor is busy or some non-leader messages take longer to process,
leader messages may get backed up enough to cause the election timer to
expire, thereby resulting in an unwanted election and leader disruption. To
alleviate this scenario, I added a Stopwatch to keep the last time a leader
message was received, ie when a leader message is received it restarts
the Stopwatch. When ElectionTimeout is received, it checks if the
elapsed time of the Stopwatch has exceeded the election timeout
interval. Therefore if leader messages were occurring during the
election timeout interval but were delayed, they will be processed
before the ElectionTimeout message and restart the Stopwatch such that the
elapsed time will/should be less than the election timeout interval by the
time ElectionTimeout is received (unless the last leader message happened to
take longer than the election timeout interval).

There are cases where ElectionTimeout is manually sent to force an
election timeout (eg during leadership transfer). In these cases we
don't want to check the Stopwatch so I added an explicit TimeoutNow
message to distinguish the 2 messages.

Change-Id: I6b745288040da2fdcef1d29cb5ffc482c9e66003
Signed-off-by: Tom Pantelis <>
7 years agoBUG-5280: centralize ShardSnapshot operations 85/42785/11
Robert Varga [Fri, 29 Jul 2016 13:58:49 +0000 (15:58 +0200)]
BUG-5280: centralize ShardSnapshot operations

Current shard snapshotting mechanism does not allow for evolution
of the snapshot contents and contains only the root node. Also
the serialization and deserialization operations are scattered
in multiple places, making coordinated changes a bit troublesome.

This patch introduces a versioned snapshot abstraction and moves
serdes operations into a single place. A new serialization format
is introduced, which holds the root node and some additional
metadata. No concrete metadata is defined in this patch, but this
will be used to transfer frontend protocol state from shard leader
to shard follower.

It also moves the act of creating a snapshot into ShardDataTree
and creates a dedicated actor to handle the snapshotting task,
which is used for all snapshot requests for a particular Shard.
Also makes the actor message internal to the ShardSnapshotActor,
providing a convenience method to create and dispatch it.

Change-Id: I6d9680b6ef08672c363092a649255013980c0bd6
Signed-off-by: Robert Varga <>
7 years agoReduce missing feature warning to debug 01/42801/2
Tom Pantelis [Fri, 29 Jul 2016 19:37:35 +0000 (15:37 -0400)]
Reduce missing feature warning to debug

Many warn messages are emmitted for the "startup" feature:

  Feature: startup, 0.0.0 is missing from features service. Skipping

It seems this is an internal karaf feature and can't be retrieved. This
warning has been seen for other system features in the past. Since the
FeatureConfigPusher is only interested in ODL bundles for the purpose of
pushing CSS modules and since this warning has always been benign, I reduced
the log to debug to avoid the many warnings on startup.

Change-Id: Iad00acccfd0eabd55acb02493e689879e29646f0
Signed-off-by: Tom Pantelis <>
7 years agoMove generated sources to target/ directory 64/42864/2
Robert Varga [Sun, 31 Jul 2016 20:42:37 +0000 (22:42 +0200)]
Move generated sources to target/ directory

Generating bindings into src/ is a very bad idea, as that:
- does not conform the expectations
- does not get cleaned by maven
- makes the life for bindings hard (checkstyle, cpd, etc.)

Change-Id: I0d594aa849934c4ac88f8ebb0d4dcc8ea5a4e3e6
Signed-off-by: Robert Varga <>
7 years agoMake deserializeNormalizedNode more obvious 03/42803/2
Robert Varga [Fri, 29 Jul 2016 19:41:17 +0000 (21:41 +0200)]
Make deserializeNormalizedNode more obvious

Performing a direct return makes the code flow
more obvious, notably the fact that a null node
may only be received in case of new serialization.

Change-Id: Ib10c23d5990ca4452914b7f81647fd67b84863d2
Signed-off-by: Robert Varga <>
7 years agoAcquire SchemaContext from ShardDataTree 84/42784/3
Robert Varga [Fri, 29 Jul 2016 14:02:10 +0000 (16:02 +0200)]
Acquire SchemaContext from ShardDataTree

Instead of passing the SchemaContext explictly, make
ShardRecoveryCoordinator understand that it can obtain
the SchemaContext from ShardDataTree.

Change-Id: Id5ed521a96e8a741ad7da6199ba117b99a8f78e4
Signed-off-by: Robert Varga <>
7 years agoFix incorrect readResolve signatures 31/42731/2
Tom Pantelis [Thu, 28 Jul 2016 16:46:28 +0000 (12:46 -0400)]
Fix incorrect readResolve signatures

In several Serializable classes the return type of the readResolve
method is the class. However this is incorrect - the return type must
be Object or it is not recognized by the serialization framework.
Eclipse actually flags the incorrect signature with the "unused" warning
but the warning was suppressed in the code. Using the correct Object
return type, Eclipse doesn't issue the warning.

Change-Id: Id53182925fa48879f1f754c3f25361fb846b23ca
Signed-off-by: Tom Pantelis <>
7 years agoCDS Frontend client actor should delete prior snapshots 72/42272/4
Tom Pantelis [Thu, 21 Jul 2016 19:57:35 +0000 (15:57 -0400)]
CDS Frontend client actor should delete prior snapshots

The RecoveringClientActorBehavior increments the last generation id and
saves a new snapshot. However the prior snapshots remain in akka
persistence - every time the controller is restarted a new snapshot file
is created. We should delete the prior snaphsots.

The snapshot file names were very long with escape chars b/c
FrontendIdentifier.toString is used for the frontend client actor's
persistence ID. We should use a shorter, more readable ID, so I changed
it to the form:


Change-Id: I1c77c826729ca1a36497a1236ac99f7cc77efb72
Signed-off-by: Tom Pantelis <>
7 years agoUse ActorSystem.terminate() 68/42668/2
Robert Varga [Thu, 28 Jul 2016 01:53:44 +0000 (03:53 +0200)]
Use ActorSystem.terminate()

ActorSystem.shutdown() has been deprecated, move on
to the replacement call.

Change-Id: I21cee3100c84003585afd9c95706c26f686d0eec
Signed-off-by: Robert Varga <>
7 years agoRemove src/main/yang as source folder 86/42586/2
Michael Vorburger [Tue, 26 Jul 2016 16:33:14 +0000 (18:33 +0200)]
Remove src/main/yang as source folder

The binding-parent now adds it as a resource folder.

Bug: 6252
Change-Id: I4b4d9b15b95b021f78e70dfb33c6f5287a0f44fe
Signed-off-by: Michael Vorburger <>
7 years agoConvert AppendEntries and reply to Externalizable proxy 79/42479/3
Tom Pantelis [Sun, 24 Jul 2016 20:59:35 +0000 (16:59 -0400)]
Convert AppendEntries and reply to Externalizable proxy

Converted the AppendEntries and AppendEntriesReply messages to use the
Externalizable proxy pattern. The classes remain Serializable but use an
internal Externalizable Proxy class with writeReplace and readResolve.
This reduces the serialized size to less than half.

Change-Id: Ica1a8ce09458b49b2993d3304ee2d80e38d4fc59
Signed-off-by: Tom Pantelis <>
7 years agoFix test failure in ShardTest 70/42570/2
Tom Pantelis [Tue, 26 Jul 2016 05:22:31 +0000 (01:22 -0400)]
Fix test failure in ShardTest

SHardTest#createSnapshotTest failed on jenkins due to using the
CallingThreadDispatcher, which is the default for test actors, instead
of the default dispatcher.

Change-Id: Id0d8186cb8bda356b81a056f4a0fd2bbecd3c7b4
Signed-off-by: Tom Pantelis <>
7 years agoRemove getModuleName()/getInstanceName() in IT 02/42502/2
Alexis de Talhouët [Mon, 25 Jul 2016 20:30:14 +0000 (16:30 -0400)]
Remove getModuleName()/getInstanceName() in IT

Since it was depreacted here

Change-Id: Iaaa6f4b89f4220c2fff01d216a97d785ab4ac3b5
Signed-off-by: Alexis de Talhouët <>
7 years agoApply SchemaContext to dataTree first 10/42410/3
Robert Varga [Sun, 24 Jul 2016 19:05:30 +0000 (21:05 +0200)]
Apply SchemaContext to dataTree first

DataTree.setSchemaContext() can fail, hence do not update the schema
context before we propagate it to data tree.

Change-Id: I0170133177ac74280da2ccc367b3c447f9d4cdc9
Signed-off-by: Robert Varga <>
7 years agoBUG-5280: implement transaction dispatch 46/39946/63
Robert Varga [Tue, 7 Jun 2016 12:59:14 +0000 (14:59 +0200)]
BUG-5280: implement transaction dispatch

This patch adds the DOMStore interface in DistributedDataStoreClient
and defines the missing messages.

Change-Id: I6b0905fb97e3269c12a5cd8f2c681e4caeb14e3e
Signed-off-by: Robert Varga <>
7 years agoRestart BP container after dependency wait time out 20/42320/3
Tom Pantelis [Fri, 22 Jul 2016 04:11:44 +0000 (00:11 -0400)]
Restart BP container after dependency wait time out

The blueprint container first waits for all dependencies (ie OSGi
services, clustered app config etc). By default it waits 5 min after
which it fails the container. For a missing OSGi service this is
probably OK but it could take longer for a clustered-app-config if the
data store isn't available. Ideally we would use an infinite timeout but
unfortunately the timeout can't be configured globally - it can only be set
at the bundle level in the manifest and we don't want to have to
configure it in every bundle (although it may be possible with some maven
magic in odlparent). Therefore I added code in BlueprintBundleTracker to
listen for container FAILURE events and restart the container if it's
due to missing dependencies.

Change-Id: Ib8ebb1a02dfd601e48722f9fc3011df7391432cb
Signed-off-by: Tom Pantelis <>
7 years agoBug 6027 - Can't start karaf using symbolic link 82/39982/12
Alexis de Talhouët [Tue, 7 Jun 2016 23:04:15 +0000 (19:04 -0400)]
Bug 6027 - Can't start karaf using symbolic link

When executing the karaf script, it gets the DIRNAME based on $0
which is the path used to start the script. This DIRNAME is then
used to set the KARAF_HOME and multiple other KARAF_* evn variables.

Using a symbolic link, you would have, for instance, usr/bin/karaf
redirecting to /opt/opendaylight/bin/karaf.
So $0 would be usr/bin and not /opt/opendaylight/bin so the locateHome
function isn't setting the right path for the KARAF_HOME.

This ends up failing to start ODL with following ERROR:
Error: Could not find or load main class org.apache.karaf.main.Main


Change-Id: I36eff657972768de7d7b90f6563addfc3dd96c0f
Signed-off-by: Alexis de Talhouët <>
Co-Authored-By: Michael Vorburger <>
7 years agoRemove useless .gitignore 34/40934/5
Alexis de Talhouët [Tue, 28 Jun 2016 12:51:08 +0000 (08:51 -0400)]
Remove useless .gitignore

src/main/yang doesn't contain any models, nor nothing.
So it is safe to remove this gitignore

Change-Id: Ib97cb5b1443a02399d8ce3c0c8b56c7a44ee614b
Signed-off-by: Alexis de Talhouët <>
7 years agoAdd again mdsal-singleton but remove prefix DOM 17/42317/4
Vaclav Demcak [Fri, 22 Jul 2016 10:54:16 +0000 (12:54 +0200)]
Add again mdsal-singleton but remove prefix DOM

We have only one implementation of ClusterSingletonServiceProvider
(DOM implementation) and we'd like to present it without DOM prefix.

* remove DOM prefix from ConfigSubsystem yang
* again add the odl-mdsal-singleton-dom feature
* again add CSSProvider in 06-clustered-entity-ownership.xml file

depends on:

Change-Id: Ieae0d462fe9fa523b2b1b18528759e0614b0225f
Signed-off-by: Vaclav Demcak <>
7 years agoFix delete snapshots criteria 03/42303/2
Tom Pantelis [Thu, 21 Jul 2016 23:09:47 +0000 (19:09 -0400)]
Fix delete snapshots criteria

When a snapshot is saved, we attempt to delete prior snapshots as only
the last one is recovered from persistence. For the maxSequenceNr in the
criteria, we use snapshot sequenceNr - snapshot batch count. However
this assumes every snapshot is based on snapshot batch count. We may
snapshot for other reasons, eg install snapshot on follower. This can
leave multiple prior snapshots behind and use up significant disk space.

We should only retain the last snapshot saved so I changed the criteria
to use: maxSequenceNr = the saved snapshot sequenceNr (it's possible the
sequenceNr hasn't changed from th elast snapshot) and maxTimeStamp =
saved snapshot timestamp -1.

Change-Id: I35b1d71ed433d52ecff79ca07a81616e393a7b7f
Signed-off-by: Tom Pantelis <>
7 years agoAdd mdsal-eos-binding-adapter feature 66/42166/2
Tom Pantelis [Wed, 20 Jul 2016 06:54:59 +0000 (02:54 -0400)]
Add mdsal-eos-binding-adapter feature

Added the feature that contains the binding adapter implementation of
the EntityOwnershipService.

Change-Id: Iccdd99833938b827e69603412385392b98b62abf
Signed-off-by: Tom Pantelis <>
7 years agoComment out mdsal-signleton-service in controller 11/42311/1
Vaclav Demcak [Fri, 22 Jul 2016 12:11:44 +0000 (14:11 +0200)]
Comment out mdsal-signleton-service in controller

We'd like to have only one (DOM) ClusterSingletonServiceProvider in ODL.
So we have to commented out all actual reference for CSS DOM API in
controller and we'll able to clean MD-SAL CSS projects for DOM API
and stay with common API only.

So this patch has to be applay before

Change-Id: I110b4554e4713802b9c261de8b1fd793eabb012a
Signed-off-by: Vaclav Demcak <>
7 years agoChange default value of parameter "auto-down-unreachable-after" 94/42094/6
Sai MarapaReddy [Tue, 19 Jul 2016 20:49:21 +0000 (13:49 -0700)]
Change default value of parameter "auto-down-unreachable-after"

Akka documentation suggests not using auto-down feature
in production scenario.
Link -

Change-Id: I24205a34e13c711791186b1e00d5203f623a0478
Signed-off-by: Sai MarapaReddy <>
Author: Sai MarapaReddy <>

7 years agoRemove global BindingToNormalizedNodeCodec instance 43/40743/7
Tom Pantelis [Wed, 22 Jun 2016 20:01:49 +0000 (16:01 -0400)]
Remove global BindingToNormalizedNodeCodec instance

The BindingToNormalizedNodeCodec was made a global static instance for
backwards compatibility for CSS users that inject the binding-dom-mapping-service
identity which defines the provided service as the concrete
BindingToNormalizedNodeCodec class instead of an interface. Therefore
the global static instance was created via blueprint and advertised via
its interfaces and was obtained via the static reference by the
RuntimeMappingModule for use by CSS users. The RuntimeMappingModule must
return an instance of BindingToNormalizedNodeCodec in order to provide
the binding-dom-mapping-service so obtaining the blueprint advertised OSGi
service via its interfaces and casting to BindingToNormalizedNodeCodec
failed b/c Aries creates a service proxy which loses the fact that it's a
BindingToNormalizedNodeCodec instance.

However the global BindingToNormalizedNodeCodec instance is not clean and
is problematic for supporting blueprint container restarts. Aries supports
concrete class proxies so I added an additional service export for the
BindingToNormalizedNodeCodec class in the binding-broker blueprint XML.
In addition, the blueprint XML now calls a new method, "newInstance", on the
BindingToNormalizedNodeCodecFactory to create a new instance and calls a
new method, "registerInstance", to register it with the SchemaService. The
returned ListenerRegistration instance is put into a bean so it can be
closed on destroy. The RuntimeMappingModule now obtains the
BindingToNormalizedNodeCodec instance from the OSGi registry as the other
blueprint-bridged CSS modules do. This eliminates the need for the global

Change-Id: I969ad5470967a81b37078393701c69d1898086cd
Signed-off-by: Tom Pantelis <>
7 years agoEnsure CSS modules are closed before blueprint containers on shutdown 01/40801/4
Tom Pantelis [Thu, 23 Jun 2016 14:35:07 +0000 (10:35 -0400)]
Ensure CSS modules are closed before blueprint containers on shutdown

Change-Id: I9be36a819423e904030540b161437b6f2ffd091d
Signed-off-by: Tom Pantelis <>
7 years agoExtend clustered-app-config to read default data from XML file 02/41902/4
Tom Pantelis [Fri, 15 Jul 2016 15:28:48 +0000 (11:28 -0400)]
Extend clustered-app-config to read default data from XML file

The default data can be specified in the clustered-app-config element
but it's also useful for scripting/automation or convenience to be able
to specify the default data in external XML file. The
clustered-app-config will now look for a file of the form

  <yang module name>_<container name>.xml

in a well-known location, etc/opendaylight/datastore/initial/config.

The XML file name can also be explicitly specified via the
"default-config-file-name" attribute.

Change-Id: Id310ef5ae121b8b9444a2102b93c3e382e421687
Signed-off-by: Tom Pantelis <>
7 years agoFix compiler error due to removal of InMemoryDataTreeFactory.create 60/42160/1
Tom Pantelis [Wed, 20 Jul 2016 05:38:12 +0000 (01:38 -0400)]
Fix compiler error due to removal of InMemoryDataTreeFactory.create

Change-Id: I016c1beeb55a438ba56b8076c7e792c79ac51294
Signed-off-by: Tom Pantelis <>
7 years agoAdd odl-mdsal-singleton-dom feature and CSS yang 93/42093/2
Tom Pantelis [Tue, 19 Jul 2016 01:30:39 +0000 (21:30 -0400)]
Add odl-mdsal-singleton-dom feature and CSS yang

Added the odl-mdsal-singleton-dom feature to the odl-mdsal-local-broker

Also added CSS yang and Module class for the
DOMClusterSingletonServiceProvider and added the XML to the existing
06-clustered-entity-ownership.xml file.

Change-Id: I69c7224fd7aa12742778670e7aec53118bf98332
Signed-off-by: Tom Pantelis <>
7 years agoConvert distributed EOS impl to use new DOM EOS interfaces 75/35475/14
Tom Pantelis [Fri, 26 Feb 2016 11:01:10 +0000 (06:01 -0500)]
Convert distributed EOS impl to use new DOM EOS interfaces

Change-Id: I5b2a6098a0c15f74ec2f16cb5451f3831ed913bf
Signed-off-by: Tom Pantelis <>
7 years agoAdd legacy pre-Boron EntityOwnershipService adapter 42/35442/15
Tom Pantelis [Fri, 26 Feb 2016 04:54:38 +0000 (23:54 -0500)]
Add legacy pre-Boron EntityOwnershipService adapter

Added a class that bridges between the legacy pre-Boron EntityOwnershipService
and DOMEntityOwnershipService interfaces. Also added the config yang and
Module class.

Change-Id: I77d02cb98a7dd5a713269907af7f269171c93fa8
Signed-off-by: Tom Pantelis <>
7 years agoAdded config model for mdsal.binding.codec. 15/41815/6
Tony Tkacik [Thu, 14 Jul 2016 09:56:44 +0000 (11:56 +0200)]
Added config model for mdsal.binding.codec.

Change-Id: I3ee74461e79c3332a0e8e41afe1d56af4b942a74
Signed-off-by: Tony Tkacik <>
7 years agoSwitch to StandardCharsets 81/41981/2
Robert Varga [Mon, 18 Jul 2016 14:40:07 +0000 (16:40 +0200)]
Switch to StandardCharsets

Guava's Charsets should not be used when StandardCharsets are

Change-Id: I7c52bd3070bb48857cbba82e8d4bc5993d7aea9d
Signed-off-by: Robert Varga <>
7 years agoUse mdsal.dom.codec instead of 11/41811/2
Tony Tkacik [Thu, 14 Jul 2016 09:26:24 +0000 (11:26 +0200)]
Use mdsal.dom.codec instead of

Change-Id: I90d7ccd2e9c994305931288fc39f0c990a28a866
Signed-off-by: Tony Tkacik <>
7 years agoBUG-4167: fall back to unknown module for empty YangInstanceIdentifier 87/41887/2
Robert Varga [Fri, 15 Jul 2016 10:43:58 +0000 (12:43 +0200)]
BUG-4167: fall back to unknown module for empty YangInstanceIdentifier

When we encounter an empyt YangInstanceIdentifier (for
example during listener registration), we cannot extract
a module name -- fallback to unknown, which will cause
us to talk to the default shard.

Change-Id: I2162884c5ce0d2c2f714bb66afd82f699c52d789
Signed-off-by: Robert Varga <>
7 years agoBug 6186 - fix testCandidateSerialization() 91/41691/5
Isaku Yamahata [Tue, 12 Jul 2016 04:15:53 +0000 (21:15 -0700)]
Bug 6186 - fix testCandidateSerialization()

The changeset of 97ff7dff8e58531065833736d5788808ca9e0396 make
LocalHistoryIdentifier#write() use WritableObjects#writeLongs()
instead of WritableObjects#writeLong(). In some situations, the
header length of object may be shorter.
As a result CommitTransactionPayloadTest#testCandidateSerialization()
failes. This patch fixes it by setting transaction id,
history transaction id to known value when setting up test.

Change-Id: I7fbd912564a25c92bc29f7e10bdae8ce1be52b8f
Signed-off-by: Isaku Yamahata <>
7 years agoReduce ConflictingVersionException log level to debug 47/41847/2
Sai MarapaReddy [Thu, 14 Jul 2016 16:50:11 +0000 (09:50 -0700)]
Reduce ConflictingVersionException log level to debug

In general it happens when there is  a ConflictingVersionException,
it retries and if it times out while retrying, it will log the error

The ConflictingVersionException is similar to the OptimisticLockFailuerEx
in the data store, i.e. the current config version is incremented and
recorded at the start of a push and if a second config is pushed before
 the first completes, the version changes and it detects that and
 re-pushes the first config. The CSS pushes one config at a time
 but this can happen during dependency resolution if it finds a
 dependent module that wasn't created yet or its config changed
 and needs to be dynamically recreated. The dependent module is
 pushed which results in a conflicting version. This
 happens with BGP.

Signed-off-by: Sai MarapaReddy <>
Author: Sai MarapaReddy <>
Change-Id: Ic1d4639625fa54ccc3d54331a960f421ad6fa1dd

7 years agoSet karaf.delay.console=true in etc/ 62/40262/2
Michael Vorburger [Mon, 13 Jun 2016 23:18:11 +0000 (01:18 +0200)]
Set karaf.delay.console=true in etc/

$ ./karaf
Apache Karaf starting up. Press Enter to open the shell now...
 78% [=========================================>          ]
100% [====================================================]

Karaf started in 23s. Bundle stats: 276 active, 276 total

Change-Id: Iad04b7d03aa5be5dc17e28c4d60a56ded8a2f774
Signed-off-by: Michael Vorburger <>
7 years agoDo not fix JUnit version (to 4.12), but inherit 28/41328/2
Michael Vorburger [Tue, 5 Jul 2016 12:07:46 +0000 (14:07 +0200)]
Do not fix JUnit version (to 4.12), but inherit

Found this during analysis of while grepping code
for JUnit 4.11 VS 4.12.  (This change does NOT fix bug 6156 of course,
it has nothing to do with it, but it still seemed like a sensible thing
to do.)

Change-Id: I5fb5f84ea3eda5d8ce0c21c5426e183f56762e2a
Signed-off-by: Michael Vorburger <>
7 years agoDo not override jolokia version 13/41713/2
Robert Varga [Tue, 12 Jul 2016 13:33:38 +0000 (15:33 +0200)]
Do not override jolokia version

Jolokia version is defined in odlparent (as 1.3.3), do not override that.

Change-Id: Ibaa663f9c91ce60cdd809bca1fa7d6a9262e3043
Signed-off-by: Robert Varga <>
7 years agoBug 6102: Upgrade ietf-{inet,yang}-types to 2013-07-15 95/40795/8
Lorand Jakab [Thu, 23 Jun 2016 22:14:35 +0000 (17:14 -0500)]
Bug 6102: Upgrade ietf-{inet,yang}-types to 2013-07-15

Change-Id: Id434ae938946ff0b4a7b0798d538149f6bf6b15c
Signed-off-by: Lorand Jakab <>
7 years agoBUG-5280: refactor CohortEntry 28/41428/3
Robert Varga [Wed, 6 Jul 2016 17:46:39 +0000 (19:46 +0200)]
BUG-5280: refactor CohortEntry

CohortEntry can be created in two transaction states: open and ready.
Make this explicit by hiding the two constructors and exposing two
explicit factory methods.

Change-Id: I33cb5a272828b23b8a6a2da5fad2ac3ead83ee7b
Signed-off-by: Robert Varga <>
7 years agoBUG-5280: do not pass SchemaContext to ShardCommitCoordinator 03/41403/3
Robert Varga [Wed, 6 Jul 2016 15:33:20 +0000 (17:33 +0200)]
BUG-5280: do not pass SchemaContext to ShardCommitCoordinator

ShardCommitCoordinator already has a reference to the ShardDataTree,
there is no point in passing the same SchemaContext in.

Change-Id: I307a0b1b744a3a134807799effbf434a111ff54b
Signed-off-by: Robert Varga <>
7 years agoGen. Abstract*ModuleFactory with WORKING handleChangedClass() 50/40950/4
Michael Vorburger [Tue, 28 Jun 2016 15:15:26 +0000 (17:15 +0200)]
Gen. Abstract*ModuleFactory with WORKING handleChangedClass()

Bug: 2855
Change-Id: I243da5822265db3913f6b0afb2f9393f78b0c24c
Signed-off-by: Michael Vorburger <>
7 years agoMinor clean-up: rm .checkstyle (these files are on .gitignore) 59/40959/4
Michael Vorburger [Tue, 28 Jun 2016 17:53:21 +0000 (19:53 +0200)]
Minor clean-up: rm .checkstyle (these files are on .gitignore)

Change-Id: I2db9b9a67f9cb47062b9409749a386e6559628d4
Signed-off-by: Michael Vorburger <>
7 years agoForce install snapshot when follower log is ahead 35/41535/2
Tom Pantelis [Fri, 1 Jul 2016 04:25:17 +0000 (00:25 -0400)]
Force install snapshot when follower log is ahead

It's possible for a follower's log to actually be ahead of the leader's log.
Normally this doesn't happen in raft as a node cannot become leader if its
log is behind another's. However, the non-voting semantics deviate a bit
from raft. Only voting members participate in elections and can become
leader so it's possible for a non-voting follower to be ahead of the leader.
This can happen if persistence is disabled and all voting members are
restarted. In this case, the voting leader will start out with an empty log
however the non-voting followers still retain the previous data in memory.
On the first AppendEntries, the non-voting follower returns a successful
reply b/c the prevLogIndex sent by the leader is -1 and thus the integrity
checks pass. However the follower's returned lastLogIndex may be higher in
which case we want to reset the follower by installing a snapshot.
Therefore I added a check in AbstractLeader#handeAppendEntriesReply if
the reply lastLogIndex > leader's last index.

Since the initial AppendEntries is sent immediately by the leader,
normally the follower will reply and this change works. However if a
follower happens to be disconnected and doesn't reply for some time, the
leader can still progress with new commits. If the leader has enough
commits such that its lastIndex matches or exceeds the lagging
non-voting follower, this check doesn't work. In this case, the
follower's integrity checks will fail since the leader's prevLogTerm
will differ. On reply the leader will start decrementing the follower's
nextIndex in an attempt to find where the logs match. During this
process the leader may trim its log via replicatedToAllIndex in which
case the follower's nextIndex may no longer be in the leader's log and
the leader will install a snapshot.

However if other nodes are down and prevent the log trimming then the
follower's nextIndex may be in the log until it eventually decrements to
0. The follower's integrity checks will pass in this case since the
leader's prevLogIndex will be -1. The follower will then attempt to add
the leader's log entries to its log. It first loops the log entries in
the AppendEntries with the intent of skipping matching entries in its
log (ie index and term the same) and stopping when it finds an entry
that doesn;t exist or finds one whose term doesn't match, in which case
it removes the entries beginning at this index. However I found some
issue in this code. First it was calling get on the getReplicatedLog
which doesn't take into account that the index may be part of the prior
snaphot and not actually in the log. I changed this check to
isLogEntryPresent which takes into account the snapshot. Second, if it
hits a conflicting entry it tries to remove it from the log. However,
as before, it may be in the snapshot and not in the log in which case
nothing gets removed. To alleviate this, I modified removeFromAndPersist
to return a boolean - false meaning it didn't find the index. In this
case I changed it to send back a reply to force a snapshot.

I added several tests in a new class NonVotingFollowerIntegrationTest
that runs thru various scenarios to cover the cases described above.

While testing I ran into some orthoganl issues that I also fixed.

- if a leader has only non-voting followers, on replicate, it should
  immediately commit and apply to state as it does when there's no
  followers since it doesn't need consensus from non-voting followers.
  So I added a method anyVotingPeers to RaftActorContext to handle this

- When calculating the prevLogIndex and prevLogTerm for the
  AppendEntries message, it calls get on the getReplicatedLog
  which doesn't take into account that the index may be the snaphot
  index/term. Follower does this check prevLogIndex/prevLogTerm so
  the leader should as well.

Change-Id: I3f92fc0b92ddc6d02dc6cb0e56b444a7c61035d7
Signed-off-by: Tom Pantelis <>
7 years agoAdd CLI bundle to the startup archetype 49/41049/16
Rashmi Pujar [Wed, 29 Jun 2016 20:08:52 +0000 (16:08 -0400)]
Add CLI bundle to the startup archetype

Change-Id: I19ef17236a25cc84a9ff4b94a990d324386d9b19
Signed-off-by: Rashmi Pujar <>
7 years agoGen. Abstract*ModuleFactory handleChangedClass() with DependencyResolver 14/40514/5
Michael Vorburger [Sat, 18 Jun 2016 18:02:19 +0000 (20:02 +0200)]
Gen. Abstract*ModuleFactory handleChangedClass() with DependencyResolver

Bug: 2855
Change-Id: Ieb010d67983a4807bd1e5b55886ba0c4c3f13385
Signed-off-by: Michael Vorburger <>
7 years agoAdd option to enable/disable basic DCL and/or DTCL 72/41472/1
Ryan Goulding [Fri, 24 Jun 2016 15:50:00 +0000 (11:50 -0400)]
Add option to enable/disable basic DCL and/or DTCL

The cars stress test is a very appropriate place to measure the effects
of DCL and DTCL on a very long list.  This change adds a few RPC
implementations in order to do the following:

1) enable DCL
2) disable DCL
3) enable DTCL
4) disable DTCL

This change includes very basic DCL/DTCL implementations, which just log
a message at trace level (off by default but there for ensuring the
onData*Changed(...) method is actually called.

The existing clustering-test-app behavior doesn't change at all;  these
new RPC(s) do not need to be used, and the added Listener implementations
are not registered listeners by default.

Change-Id: I6fcec6cd8c0a082e815561e88b325a55022ad2af
Signed-off-by: Ryan Goulding <>
(cherry picked from commit 7a53dd074428ce5c4be767a51c509b1b8cf0f05e)

7 years agoBUG-5280: introduce request/response Envelope 50/41150/10
Robert Varga [Thu, 30 Jun 2016 09:57:38 +0000 (11:57 +0200)]
BUG-5280: introduce request/response Envelope

This is a follow-up patch to move sequence information from
request/response structure and making it part of an Envelope,
which is allocated by the SequencedQueue.

Change-Id: I341118850d9c5835bab0b491f59b95264f31e5ef
Signed-off-by: Robert Varga <>
7 years agoBUG-5280: implement message queueing 61/39561/75
Robert Varga [Sat, 28 May 2016 23:27:24 +0000 (01:27 +0200)]
BUG-5280: implement message queueing

This patch implements the basic queueing and timeout retry mechanism
in ClientActorBehavior.

This implementation is not very efficient, as each send goes through
the actor's mailbox, but it gets the job done and is correct. It will
be optimized in a follow-up patch, which will refactor internal
workings so that SequencedQueue is fully thread-safe and correct with
regard to request enqueue, timeouts and retries.

Change-Id: I207a30877328dbdc08d42f76a0db55b5ae162de5
Signed-off-by: Robert Varga <>
7 years agoGenerate sal-binding-broker-impl-*-test-sources.jar 15/41315/2
Michael Vorburger [Tue, 5 Jul 2016 00:36:47 +0000 (02:36 +0200)]
Generate sal-binding-broker-impl-*-test-sources.jar

This is handy so that you can see the source of e.g.
AbstractDataBrokerTest in the IDE, just like other sources.  This did
not work before because of <type>test-jar.

Change-Id: I7f1e2516e326de3eb824a728146ef4287d8419f8
Signed-off-by: Michael Vorburger <>
7 years agoClear leaderId when election timeout occurs in non-voting follower 21/41321/2
Sai MarapaReddy [Wed, 29 Jun 2016 23:31:00 +0000 (16:31 -0700)]
Clear leaderId when election timeout occurs in non-voting follower

We need to enable election timeouts on non-voting follower and clear the
leaderId when it occurs to mimic the behavior when it goes to Candidate
on election timeout.

Signed-off-by: Sai MarapaReddy <>
Author: Sai MarapaReddy <>
Change-Id: I8b3316e14315a47e09b48af2e3ea16a391ec6c5a
Signed-off-by: Tom Pantelis <>
7 years agoAdd ServerConfigPayload to InstallSnapshot message 20/41320/3
Tom Pantelis [Wed, 29 Jun 2016 06:09:49 +0000 (02:09 -0400)]
Add ServerConfigPayload to InstallSnapshot message

When the leader installs a snapshot on a follower, it needs to include the
server config info as well. Otherwise if a server config change occurred
while a follower was down, it won't get the updated server config info
and will be out of sync with the rest of the cluster which causes other

Change-Id: Ic290ed162bf9fdf6b9fe55986ea0c9c9e83b29a9
Signed-off-by: Tom Pantelis <>
(cherry picked from commit b8e21016b85e98c31d866de7b6db51691596c9f4)

7 years agoEliminate dead letters message when there's no sender 41/41241/2
Tom Pantelis [Thu, 23 Jun 2016 18:15:17 +0000 (14:15 -0400)]
Eliminate dead letters message when there's no sender

When sending a message to close a DTCL or DCL registration, if the caller
isn't interested in the reply, it passes ActorRef.noSender() (ie null). Internally
akka translates this to the dead letters actor so you see log messages
of the form "Message [...CloseDataTreeChangeListenerRegistrationReply]
from Actor[...] to Actor[akka://opendaylight-cluster-data/deadLetters] was not
delivered. [1] dead letters encountered.".

To alleviate this we should check if the sender is the dead letters actor
before sending the reply.

Change-Id: Idfaf280acf720cf5727393262638a7783c1af539
Signed-off-by: Tom Pantelis <>
7 years agoMove GlobalBundleScanningSchemaServiceImpl to its own bundle 58/40458/4
Tom Pantelis [Thu, 16 Jun 2016 01:04:02 +0000 (21:04 -0400)]
Move GlobalBundleScanningSchemaServiceImpl to its own bundle

Moved the GlobalBundleScanningSchemaServiceImpl and the associated
BundleActivator, SchemaServiceActivator, from sal-dom-broker to a new
bundle sal-schema-service.

A couple reasons for this. One is to break the circular service imports
between sal-dom-broker and sal-distributed-datastore, where
sal-distributed-datastore imports the SchemaService from sal-dom-broker
and sal-dom-broker imports the DOMDataBroker from
sal-distributed-datastore. The result of this was that if the
sal-dom-broker blueprint container was restarted, it would also cause
the sal-distributed-datastore container to restart, which isn't

The other reason is that apps can register a SchemaContextListener as an
OSGi service which is picked up by the
GlobalBundleScanningSchemaServiceImpl. In terms of service usage this
makes sal-dom-broker a dependency of the app bundle so if the app
container restarts, it also restarts sal-dom-broker,
sal-distributed-datastore etc which isn't desirable.

So moving the GlobalBundleScanningSchemaServiceImpl to its own bundle
alleviates both issues.

Change-Id: I75d1009f6bfc1d80a19a61050703a1ca7e049575
Signed-off-by: Tom Pantelis <>
7 years agoFix intermittent failure in ClusterAdminRpcServiceTest 42/41242/3
Tom Pantelis [Sat, 2 Jul 2016 06:09:34 +0000 (02:09 -0400)]
Fix intermittent failure in ClusterAdminRpcServiceTest

Time elapsed: 8.187 sec  <<< FAILURE!
java.lang.AssertionError: Leader Id
Expected: (a string containing "member-2" or a string containing
     but: was "member-1-shard-cars-config_testRemoveShardLeaderReplica"
at org.hamcrest.MatcherAssert.assertThat(
at org.junit.Assert.assertThat(

member3 tried to become leader but hadn't gotten MemberUp for member2
yet so it didn't have its address when it sent out RequestVote. The
verification of new leader timed out before it coild try again. The call
to waitForMembersUp on line 397 should be for replica3 and not replica2.

Change-Id: I3a714c91ba974b16b2c310027b09f9658915a639
Signed-off-by: Tom Pantelis <>
7 years agoBUG-6140: controll karaf zip and tar.gz creation 02/41202/2
Michal Rehak [Fri, 1 Jul 2016 10:02:16 +0000 (12:02 +0200)]
BUG-6140: controll karaf zip and tar.gz creation

    - added 2 new properties in order to easy switch configuration
      via cli or child-pom

Change-Id: I617ac958e12097260264880e3c9f45fa1e1428a1
Signed-off-by: Michal Rehak <>
7 years agoAdd maven-metadata-local.xml to .gitignore 41/41141/2
Tomas Cere [Thu, 30 Jun 2016 12:36:54 +0000 (14:36 +0200)]
Add maven-metadata-local.xml to .gitignore

Change-Id: I1350644bf1e58462564eaa88c4ac6ab34b72cc3f
Signed-off-by: Tomas Cere <>
7 years agoAdd blueprint wiring to opendaylight-archetype 61/41161/7
Alexis de Talhouët [Thu, 30 Jun 2016 18:29:51 +0000 (14:29 -0400)]
Add blueprint wiring to opendaylight-archetype

Change-Id: I0b219e8da4a1e58d6254c1dff993e8719aa14fd5
Signed-off-by: Alexis de Talhouët <>