Robert Varga [Tue, 19 May 2015 19:16:32 +0000 (21:16 +0200)]
Make sure invokeOperation is set once
This clarifies how it is initialized and make it final to ensure it is
initialized exactly once.
Change-Id: Ib05b58dec492870257da2a8653b5b6b010891312
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit
37a5dd4bdd5d0eda6afa0762b42b94762e969956)
Tom Pantelis [Wed, 13 May 2015 11:44:01 +0000 (07:44 -0400)]
Bug 3206: CDS - issues with direct commit
Modified RaftActor#persistData to send the ApplyState message instead of
calling applyState directly in case the Shard tries to persist another
entry during the persist callback.
Modified Shard to use the correct sneder to send the
CommitTransactionReply message.
The third fix is to ensure direct commits in a chain aren't committed
before previous coordinated commits. In the ShardCommitCoordinator, I
changed it to enqueue all CohortEntries when they are readied so they
are processed in that order.
I also included the unit test scenario that caused the issues to occur.
Change-Id: I65ffcbbac37d6be28c4e1c2dc17d3b0ca21847dc
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
(cherry picked from commit
cf088cc87d5e9c0dfd3fb8e47e0d6d7c5ddc19fd)
Maros Marsalek [Fri, 15 May 2015 14:36:03 +0000 (16:36 +0200)]
Disable failing config persister test
The test needs to be redesigned. BundleContext and Concurrency need to be
removed from the test to make it more stable and readable.
Looks like the failure reported by mockito is caused by "wrongly written
multi-threaded tests".
Change-Id: I85a04194573c500ce9c4c4a8cfc4960e66203545
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Tom Pantelis [Sat, 16 May 2015 19:13:41 +0000 (15:13 -0400)]
Fix CDS serialization failures due to YangInstanceIdentifier change
YangInstanceIdentifier was recently made an abstract class with 2
implementations which broke CDS serialization as it was looking for
an exact match for the YangInstanceIdentifier class.
Change-Id: Iba94dda9584f65f5c8d76a1514d3f9f09d2f0483
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
(cherry picked from commit
bc42ccb9b9bef46de08370e9d958e0e2fe3dda5a)
Marian Dubai [Fri, 15 May 2015 13:53:57 +0000 (15:53 +0200)]
Value for transactions moved to yang module
Timeout value for blocking operations within
transactions moved from AbstractWriteTx to yang module
odl-sal-netconf-connector-cfg.yang
Change-Id: I4414a613445c914b0b3262705ca5ceae058b51d5
Signed-off-by: Marian Dubai <mdubai@cisco.com>
Harman Singh [Mon, 18 May 2015 18:10:23 +0000 (11:10 -0700)]
Bug 3258 : Changed the order of condition for OrderedMap and MapNode,
same for OrderedLeafSet and LeafSet
Added a test to validate it works for OrderedMap
Change-Id: Ifb0375d47668fcc36d824fb33a8b4684e89dccc8
Signed-off-by: Harman Singh <harmasin@cisco.com>
Moiz Raja [Mon, 18 May 2015 21:12:08 +0000 (14:12 -0700)]
BUG 3249 : Operation Limiter not release on completion of operation
The OperationLimiter uses up one permit and per operation done on a
transaction. When that operation is complete the permit must be
released. For Local transactions this was not happening. Due to this
when a local transaction has more operations than the maximum outstanding
operations we would block for the operation timeout period (5 seconds
by default) this can have all sorts of adverse side effects on
transactions.
This patch ensures that for local transactions those permits are freed
up when the operation is complete.
Change-Id: Id8ba99c6ea081c7e37da0b517860dca818a91218
Signed-off-by: Moiz Raja <moraja@cisco.com>
(cherry picked from commit
7deb48eedb9aec8230c65237c48679ecca6af919)
Tomas Cere [Mon, 11 May 2015 15:11:59 +0000 (17:11 +0200)]
Log NetconfServer authentication fail when authProvider is missing.
Change-Id: I43fef075fdf43624f1b83ddec16d77c129f98964
Signed-off-by: Tomas Cere <tcere@cisco.com>
Tomas Cere [Tue, 28 Apr 2015 12:45:42 +0000 (14:45 +0200)]
Use callbacks while parsing to NormalizedNodes.
Implemented custom parsing strategies that handle netconf operations
and manipulation of the data tree in NetconfMDSal.
Change-Id: I99d7f049710393743714d90ac3123041e87040cd
Signed-off-by: Tomas Cere <tcere@cisco.com>
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Tomas Cere [Thu, 14 May 2015 10:32:02 +0000 (12:32 +0200)]
BUG 3213: Add missing netconf-tcp dependency to mdsal-netconf-connector
Change-Id: I6d9839e24e994d28f0059c7dfbd2a9e3ab4b4c05
Signed-off-by: Tomas Cere <tcere@cisco.com>
Marian Dubai [Thu, 14 May 2015 16:55:03 +0000 (18:55 +0200)]
Bug 3197: Netconf client not reconnecting due address unresolved
Netconf client not reconnecting, when failed 1st time due
address unresolved. InetSocketAddress remains in state unresolved,
after connection failed first time due address unresolved.
Now recreating InetSocketAddress by each reconnect,
so address is checked by each reconnect attempt.
Change-Id: I29ef130d7bf3f65023a611cee51245a6ae6f9a03
Signed-off-by: Marian Dubai <mdubai@cisco.com>
Maros Marsalek [Fri, 15 May 2015 09:28:19 +0000 (11:28 +0200)]
Set weak keys for binding mountpoint cache
Change-Id: Ie3995beb7f2ffe51c882bde411048b2c59780184
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Tom Pantelis [Fri, 15 May 2015 01:28:14 +0000 (21:28 -0400)]
Fix intermittent RaftActorTest failures
I've seen the following test failure on jenkins several times:
RaftActorTest.testRealSnapshotWhenReplicatedToAllIndexNotInReplicatedLog:838
expected:<Leader> but was:<Candidate>
This is a result of the short-circuiting of the election timeout scheduling
when there are no peers so it goes from from Follower -> Candidate -> Leader
quickly. The test artificially sets the behavior to Leader but the immediate
ElectionTimeout messages may cause it to switch back to Candidate and
cause assertion failures before the test completes. This didn't happen
before b/c it sets the heartbeat interval really high. To alleviate the
failures, I set a peer to elide the short-circuiting.
Change-Id: I2c086f214baefb826beb898dfe4b11b659cd1eaa
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
(cherry picked from commit
2f2dd5376f885a160d3204a407f24e174375a5a5)
Vaclav Demcak [Fri, 15 May 2015 14:24:37 +0000 (16:24 +0200)]
hotfix Bug 3226 - unable to configure flows
* NormalizedNodeContainer has NodeIdentifierWithPredicates which
has to contain the map of all node keys
* (new codecs [xml,json] don't populate Attributes)
Change-Id: I5befc6d8ad5a63a04c11ad9102610be9508df672
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
(cherry picked from commit
f00c40b510b85a0adbc407ba745a606bb4910a09)
Kamal Rameshan [Thu, 14 May 2015 00:19:07 +0000 (17:19 -0700)]
Bug-2704:Clustering: Fix akka-raft TestDriver logging to run with slf4j
Change-Id: I5634914b086d87557afb9a851c47958744301253
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
(cherry picked from commit
864f3c5bb156a7f6f6e2d91a6c7d43e916909e84)
Moiz Raja [Sat, 16 May 2015 00:44:11 +0000 (17:44 -0700)]
BUG 3232 : Fix intermittent failure in ShardTest
Change-Id: Ia556fe4833614080d891dd1edcfa8878152bc595
Signed-off-by: Moiz Raja <moraja@cisco.com>
(cherry picked from commit
1b4baa35633543d70488d7b5cd7dd92147b643bc)
Moiz Raja [Mon, 11 May 2015 22:43:43 +0000 (15:43 -0700)]
BUG 3125 : Set Rate Limit just before acquiring a permit to avoid contention
During perfomance test performance is hampered by the rate limiting code. To
avoid the penalty of possible contention when setting the rate limit in a
separate thread from the one acquiring a rate permit this patch calculates the
new rate limit and sets it on the rate limiter on the same thread which
acquires the rate limit.
Moving the setting of the rate limit into the same thread which does the
acquiring of the permit did not have any discernable effect on performance so
I continued playing around and found that simply calculating the rate limit
can cause issues with performance. This happens because the Coda Hale metrics
Timer that we use to help calculate the rate limit is also synchronized
internally with a read write lock and that causes contention.
To fix the situation with the rate limit calculation I do not calculate the rate
limit everytime someone tries to acquire a permit but only after acquiring about 1/2 of
the last calculated rate limit.
To make it easier to understand/test the rate limiting code I have slightly refactored
the code. All the transaction rate limiting code is now in TransactionRateLimiter.
After making these changes I was able to get the same performance in the dsBenchmark
test as you would get from not using a rate limiter at all.
Change-Id: Ia7639ac3acdc08140fbf5eef03120f857dc44994
Signed-off-by: Moiz Raja <moraja@cisco.com>
(cherry picked from commit
89e2dda49ea99a79d510a9cc72ebcb09a9d879de)
Tom Pantelis [Fri, 24 Apr 2015 15:17:27 +0000 (11:17 -0400)]
Bug 3020: Add version to AppendEntries and AppendEntriesReply
To handle backwards compatibility, a leader needs to know the version of
its followers wrt to the derived RaftActor's payload data. This will
enable
the derived RaftActor to translate its payload data to an older version.
So I added a version field to AppendEntriesReply which the leader stores
in the FollowerLogInformation.
In addition, a follower needs to know the version of its leader so we
can handle backwards compatibility wrt to transactions since we no
longer send the CreateTransaction message to the leader (currently only
for write-only). This patch adds a version field to AppendEntries - a
subsequent patch will utilize it.
Change-Id: I41632024a270206153e7c5d363ee1c79800e4200
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
(cherry picked from commit
655216a6c75aa29d31c4c56c56a5000db56ba233)
Robert Varga [Fri, 24 Apr 2015 11:33:24 +0000 (13:33 +0200)]
CDS: Implement front-end support for local transactions
Implemented support on the TransactionProxy front-end for optimizations
where the Shard is local to the controller instance. In this mode, the
Shard's DataTree obtained from the FindPrimaryShard message is used to
prepare the modifications completely on the front-end. On ready, the
DataTreeModification instance is passed to the Shard via
the ReadyLocalTransaction message. The Shard then does a direct commit,
eliding the 3PC from the front-end (it's a no-op as it is for remote
write-only txns).
TransactionContext instances are now obtained via an
AbstractTransactionContextFactory passed to TransactionProxy of which
there are 2 kinds: one for single, unchained txns and one for chained
tnxs. Each creates a different DOM transaction instance to handle
preperation of modifications. The DOM transacton is wrapped in a
LocalTransactionContext which the TransactionProxy interfaces with.
Change-Id: I0322b586f394e4b6c7793b8287ac804b41964378
Signed-off-by: Robert Varga <rovarga@cisco.com>
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
(cherry picked from commit
2f7c93174d7834a4c4aedacc9b88aa53a5a0422c)
Robert Varga [Fri, 1 May 2015 19:57:32 +0000 (21:57 +0200)]
CDS: make sure to assert non-null Exception in test
The exception can be potentially null, make sure we fail the test if it
is.
Change-Id: I6b987e2962abfaa8afa570791e3500fa4916e5c2
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit
366726ce5400e77ad813aba0ed1289331093db50)
Tomas Cere [Tue, 5 May 2015 09:21:18 +0000 (11:21 +0200)]
Add AuthHandler to stresstool
Stop bundling BouncyCastle into strestool uber-jar,
JCE certificate gets wiped this way and Oracle JDK refuses to use it.
Instead export them into target/lib dir and setup stresstool jar classpath to point to this directory.
Change-Id: I3c7ab9ea0f5faba2f02f4e0cfa21adda6bce2e4e
Signed-off-by: Tomas Cere <tcere@cisco.com>
Vaclav Demcak [Fri, 24 Apr 2015 13:14:27 +0000 (15:14 +0200)]
Bug 2981 - POST mismatching IDs data vs URI possibility
fix forgotten validation for check IDs from data and Uri
Change-Id: I465a3550399c5d2d4fcb546b608a9b47e3d97e63
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
Moiz Raja [Thu, 14 May 2015 00:11:39 +0000 (17:11 -0700)]
BUG 3200 : Serialize a child node even when it is UNMODIFIED
Change-Id: If1220cd2a84d770ca02bca6a5f070032188b5e21
Signed-off-by: Moiz Raja <moraja@cisco.com>
(cherry picked from commit
1c06873f9d31586aa73ba6ca72b1c286887dbd02)
Moiz Raja [Thu, 7 May 2015 01:43:31 +0000 (18:43 -0700)]
BUG 3156 : Recreating CDS should not fail
When CDS is recreated it can fail because we try to
create actors on a datastore that is already terminated.
To address this issue I have enhanced DistributedDataStoreFactory
as follows,
- Simplified the actor system creation code by synchronizing
all static methods. Since these methods are anyway not used in
any fast paths - it is a fair enough solution.
- Added another static field in DistributedDataStoreFactory to
track the createdInstances. This is so that we can properly
cleanup the actor system as instances of the data store are destroyed.
- The actor system is now shutdown when there are no datastrore instances.
- Removed actor system shutdown from ActorContext to ensure that we
use the symmetric method destroyInstance
Now that we do not shutdown actor system till both the data stores
are destroyed it may so happen that we may have a situation where we are
trying to create an actor on the old actor system with an already used name
like shardmnanager-config or shardmanager-operational. To avoid this
I have added a loop when creating shardmanager which catches the thrown
exception and retries 100 times after waiting for 100 milliseconds. This
is to give some time for the actor to properly die.
Change-Id: I3c8b2b3b21a1519610bf2ed5e1af8be93f3120ce
Signed-off-by: Moiz Raja <moraja@cisco.com>
(cherry picked from commit
35f8cf2335afa8cf87ce565bbb974431ad5008a6)
Tom Pantelis [Fri, 8 May 2015 21:18:36 +0000 (17:18 -0400)]
Bug 3161: Create new UpdateElectionTerm class
Deprecated inner class RaftActor.UpdateElectionTerm and created a new
stand-alone UpdateElectionTerm class with serialVersionUID set.
Change-Id: Idf9a67656f0103e4f8e668e0812a80687423bfdd
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
(cherry picked from commit
dc3e8242e7f0a2c937bacad2f2a7d41162d2209e)
Tony Tkacik [Mon, 27 Apr 2015 12:16:06 +0000 (14:16 +0200)]
Bug 2351 Speed-up Binding-to-Binding routed RPC Invocation.
Current RPC Broker uses LazySerializedContainerNodes
when going thru DOM RPC broker, so in case
RPC is returned it can by-pass deserialization and
use Binding DTO directly.
In case of routed RPCs full serialization to normalized
node was triggered when DOM RPC broker tried to
read RPC route.
This patchset introduces support for LazySerializedContainerNode
to precompute this value and do not use full serialization
when DOM Rpc Broker reads only routing context.
Change-Id: I6d949b5257d40a96ae9edce3bf15c4c3ff932c27
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
(cherry picked from commit
313b9c3cdff6c7fbf94583db4b8933aa394bccc0)
Tom Pantelis [Fri, 8 May 2015 20:32:41 +0000 (16:32 -0400)]
Bug 3161: Remove serialVersionUID to maintain backwards compatibility
The serialVersionUID field was added earlier in Lithium for
RaftActor.DeleteEntries and RaftActor.UpdateElectionTerm however it
breaks backwards compatibility. We need to remove serialVersionUID.
DeleteEntries has already been deprecated for a new class that has
serialVersionUID set and is not an inner class. I will do that same for
UpdateElectionTerm in another patch.
Change-Id: I8180de5865d89d3fea190e48ebeb825743af959d
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
(cherry picked from commit
0dd3756434941ff5635a3a3bc60a2f0b59338c1c)
Tony Tkacik [Wed, 22 Apr 2015 13:01:48 +0000 (15:01 +0200)]
Bug 1773: Use new Binding Notification Broker by default.
New Binding Notification Broker is required in order
to forward Notifications from Binding producers
to DOM Broker, so these notifications could be exposed
via netconf / restconf or in future releases via
clustering.
Change-Id: I520eb0b31512ec5f2114f0a5ee9492f5d9210679
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Robert Varga [Sat, 25 Apr 2015 08:44:13 +0000 (10:44 +0200)]
CDS: add backend support for local transactions
Add the message for submitting a DataTreeModification from the frontend
and the logic to apply it to the Shard's DataTree instance. This is
similar to BatchedModifications, except is is always considered ready.
The ReadyLocalTransaction is not directly serializable, but we create a
new serializer, which turns it into BatchedModifications when
serializing to byte stream.
Change-Id: I23a39c7b5997b48a355af73287d19bbf3ab0ae20
Signed-off-by: Robert Varga <rovarga@cisco.com>
Tony Tkacik [Wed, 6 May 2015 10:42:28 +0000 (12:42 +0200)]
Bug 3135 - Fixed support for InterestListener
InterestListener was one of undocumented beta MD-SAL APIs
which was not intented for public support, but accidentally
was public since Hydrogen and as it turned out other Opendaylight
projects started to using it.
Added support to affected components in order to still support
this API even when using new Notification Broker.
Change-Id: I060474f68a6c37ed05b262a9b46923f668ca3c8b
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
(cherry picked from commit
96246098ccbe56af4f688d93dfffc9fdf62713ab)
Tomas Cere [Thu, 7 May 2015 11:39:51 +0000 (13:39 +0200)]
Fix racecondition in AsyncSshHandlerWriter
Fixed racecondition between releasing of netty ByteBuff and removing the msg from pendingWrites.
Change-Id: I40eff55d9c7858534d105a242d3ec6feb9d950d0
Signed-off-by: Tomas Cere <tcere@cisco.com>
Tomas Cere [Mon, 11 May 2015 08:03:18 +0000 (10:03 +0200)]
Add NetconfXmlUnitRecursiveQualifier to netconf-util.
XmlUnit's RecursiveElementNameAndTextQualifier has trouble with non-trivial xml's and
element order in bigger depths.
This adds our own qualifier based on XmlUnit's implementation.
Change-Id: Ie89e84813e11cb2af7c9d3c0c6d80377816f79a7
Signed-off-by: Tomas Cere <tcere@cisco.com>
Tom Pantelis [Sat, 9 May 2015 03:36:50 +0000 (23:36 -0400)]
Change http port for NorthBoundIT tests
The NorthBoundIT tests are failing on jenkins due to port http 8080
already in use. I don't know what else would be running on port 8080
on the build machines - maybe a remnant of another test that didn't
cleanup or didn't finish cleaning up in the background. In any event,
I changed the port to 8180 to hopefully avoid the issue so verify
builds can succeed.
Change-Id: Ia11ef1d69c8cd5948063ec6dbfc08fab2492319c
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
(cherry picked from commit
0ffa3f90a7546c29165d13b9ff448a82f0af1317)
Moiz Raja [Wed, 29 Apr 2015 04:00:30 +0000 (21:00 -0700)]
Fix test to return PrimaryShardInfo when retrieving primary shard
Without these changes the tests log a lot of ClassCastExceptions when
run.
I also removed one method in the test that was unused
Change-Id: I9501dc7cd6be461297052182de79dae831409a8c
Signed-off-by: Moiz Raja <moraja@cisco.com>
(cherry picked from commit
17787472279e0c04061a1ef1ad2b110b1f77b9b3)
Robert Varga [Sat, 2 May 2015 03:02:07 +0000 (05:02 +0200)]
Use MoreExecutors.directExecutor()
Remove open-coded equivalent of the direct executor. We do not need an
ExecutorService, so it is sufficient and does precisely what our class
did.
Change-Id: Ib9424a1b4d3ba56f32ef5aec525de4026be0970a
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit
335ea558bd22d4b09e4490aed96ddcbe44da6d76)
Robert Varga [Mon, 27 Apr 2015 12:40:45 +0000 (14:40 +0200)]
CDS: Introduce ChainedTransactionIdentifier
Conceptually the identifier of a a transaction is an extension point,
which allows passing of arbitratry, extensible identifier. It can thus
be reused to track the chain identifier as well as the normal source
coordinates.
Introduce ChainedTransactionIdentifier to carry the transaction chain ID
attached to the transaction on the frontend. This is not used in this
commit directly, but rather in the follow-up patch.
Change-Id: Iad24a1b59c6231e003579bb25149b73b11d6db25
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sat, 25 Apr 2015 15:05:01 +0000 (17:05 +0200)]
CDS: split TransactionType from TransactionProxy
The type is used outside, too, so split it out into its own file.
Change-Id: I00589bc46b724ae5b0de3852056111a3f1bcb897
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sat, 25 Apr 2015 14:46:50 +0000 (16:46 +0200)]
CDS: do not propagate SchemaContext
TransactionContext implementations do not need, so remove the
constructor argument and adjust callers.
Change-Id: I7f6644e3e673057586a1ec6cfbe93b6e258ca9ad
Signed-off-by: Robert Varga <rovarga@cisco.com>
Tony Tkacik [Thu, 7 May 2015 10:26:05 +0000 (10:26 +0000)]
Merge "BUG-3095 Add EventTime attribute to DOMNotification from netconf"
Tony Tkacik [Thu, 7 May 2015 09:56:54 +0000 (09:56 +0000)]
Merge "Add missing copyright text"
Tony Tkacik [Thu, 7 May 2015 09:28:02 +0000 (09:28 +0000)]
Merge "BUG 2954 : Thread local DocumentBuilder's for XmlUtil"
Tony Tkacik [Thu, 7 May 2015 07:55:36 +0000 (07:55 +0000)]
Merge "Bug 2983 - POST operation to list only accepts data for keys"
Maros Marsalek [Tue, 5 May 2015 16:47:37 +0000 (18:47 +0200)]
BUG-3095 Add EventTime attribute to DOMNotification from netconf
Introduced new interface DOMEvent and DOMNotifications from
sal-netconf-connector implement this interaface. The eventTime is parsed from
the the notification xml.
Change-Id: I833d86d91f752be55fef3e641a6c8654d2f65a28
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Maros Marsalek [Fri, 24 Apr 2015 09:02:45 +0000 (11:02 +0200)]
Custom BufferedWriter implementation without newLine()
This BufferedWriter does not provide newLine() method and does not read the
line.separator property via AccessController when its initialized. Whithout this
expensive call, its allocation is much faster. Used in netconf message encoder
to make the netconf serialization faster.
Change-Id: I88a65c7a82ff7c44b9ad3a3adfe7d7482a5fdc70
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Jan Hajnar [Thu, 23 Apr 2015 07:15:43 +0000 (09:15 +0200)]
Bug 2983 - POST operation to list only accepts data for keys
* added catch for ResultAlreadySetException in JsonNormalizedNodeBodyReader
Change-Id: I07d8b8b63e5c2de84b0ee7ec66013d38c58c7b49
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
Tony Tkacik [Mon, 4 May 2015 12:55:23 +0000 (12:55 +0000)]
Fixed export package section of sal-binding-broker.
Change-Id: I09a0c50f8c6a96992ccca2648bec6759c85ff02a
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
(cherry picked from commit
ca7e8c9bbb5c58783153153dc0288cac67b0a17a)
Tony Tkacik [Tue, 5 May 2015 08:23:31 +0000 (08:23 +0000)]
Merge "BUG 2820 - LLDP refactor"
Tony Tkacik [Tue, 5 May 2015 08:23:19 +0000 (08:23 +0000)]
Merge "Bug 2820 - LLDP TLV support and testing"
Tony Tkacik [Tue, 5 May 2015 08:23:12 +0000 (08:23 +0000)]
Merge "Bug 2820 - problem to add second TLV with type 127."
Tony Tkacik [Mon, 4 May 2015 12:27:40 +0000 (12:27 +0000)]
Merge "Remove "Unavailable" properties from ShardStats"
Tony Tkacik [Mon, 4 May 2015 12:04:58 +0000 (12:04 +0000)]
Merge "BUG 3057 - notify added event source by topics created before"
Tony Tkacik [Mon, 4 May 2015 08:42:10 +0000 (08:42 +0000)]
Merge "Bug 3068 - checkRpcResponse - CancellationException"
Tony Tkacik [Mon, 4 May 2015 08:23:06 +0000 (08:23 +0000)]
Merge "Make TCP netconf endpoint configurable"
Tony Tkacik [Mon, 4 May 2015 08:22:02 +0000 (08:22 +0000)]
Merge changes Ibe016728,Ic719c519,I87a81a54
* changes:
Fix mac address generator in stress client
Modify multiple physical address atributes in stress-client payload.
Multiple clients for stresstool
Tony Tkacik [Mon, 4 May 2015 08:21:17 +0000 (08:21 +0000)]
Merge "BUG 3066 : Optimistic lock failed, on NetconfStateUpdate"
Tony Tkacik [Mon, 4 May 2015 08:20:34 +0000 (08:20 +0000)]
Merge "Bug222:Comments incorporated for response based Restconf statistics"
Jan Hajnar [Tue, 28 Apr 2015 11:14:46 +0000 (13:14 +0200)]
Bug 3068 - checkRpcResponse - CancellationException
* added catch for CancellationException in RestconfImpl
Change-Id: I3ebb2c4fd2a521ed0977075975a1302301b801fa
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
Evan Zeller [Thu, 30 Apr 2015 21:59:25 +0000 (14:59 -0700)]
Bug 3010: Improve restconf error clarity.
Change-Id: Ib54e96f1a70a187d940f843ed624f4a0f3c4ead0
Signed-off-by: Evan Zeller <evanrzeller@gmail.com>
Moiz Raja [Fri, 1 May 2015 04:20:24 +0000 (04:20 +0000)]
Merge "BUG 3049 : Upgrade from akka 2.3.9 to 2.3.10"
Tom Pantelis [Fri, 1 May 2015 00:26:16 +0000 (20:26 -0400)]
Remove "Unavailable" properties from ShardStats
There's several property getters in ShardStats that don't apply anymore
and return null. They display as "Unavailable" in JConsole but cause an
NPE when queried via jolokia. We should remove them.
Change-Id: I6da8f331e007246c655a982b9cd335de553195aa
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
(cherry picked from commit
63c43e481fe503a3b90c7e6c55ac21514be0f6db)
Moiz Raja [Thu, 30 Apr 2015 21:41:17 +0000 (14:41 -0700)]
BUG 3049 : Upgrade from akka 2.3.9 to 2.3.10
akka 2.3.10 has fixes related to the kind of issues reported in BUG
3049.
Cherry picked from stable/lithium
Change-Id: I51c094ff939ca0f4b31d685bae3e195d22ddb518
Signed-off-by: Moiz Raja <moraja@cisco.com>
Moiz Raja [Fri, 1 May 2015 00:02:41 +0000 (00:02 +0000)]
Merge "Bug 2853 : Adding Remote RPC MX bean"
Anton Ivanov [Mon, 30 Mar 2015 12:27:38 +0000 (12:27 +0000)]
BUG 2914 TCP Options incorrect
Obvious - basic use of TCP in a double-buffering environment for command/responce protocols.
Change-Id: I4d5117039bdcdc089adb177972ab9460165d6297
Signed-off-by: Anton Ivanov <aivanov@brocade.com>
Harman Singh [Thu, 30 Apr 2015 01:26:44 +0000 (18:26 -0700)]
Bug 2853 : Adding Remote RPC MX bean
This bean gives three attributes - bucket versions,local registered routed rpc names and global rpc
bucket versions will give information of latest version of remote rpc buckets on all nodes of cluster.
Name of locally registered RPCs can be found in other two attributes.
Two Search operations - findByRpcName and findByRpcRoute helps to search RPCs registered in cluster
via name or route keyword. Search happens in both local and remote bucket.
Change-Id: Ief08eb2e42deafdf2627c61e58c2e2a50f7dcd09
Signed-off-by: Harman Singh <harmasin@cisco.com>
Tony Tkacik [Thu, 30 Apr 2015 14:53:02 +0000 (14:53 +0000)]
Merge "BUG-2288: deprecate old binding Notification API elements"
Tomas Cere [Wed, 29 Apr 2015 11:43:01 +0000 (13:43 +0200)]
Make TCP netconf endpoint configurable
Allow users to configure netconf endpoint for md-sal to use pure TCP instead/or along with SSH.
Change-Id: I03d067322b0c02ba335d554da51c56db77c22bfb
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Signed-off-by: Tomas Cere <tcere@cisco.com>
Tom Pantelis [Thu, 30 Apr 2015 05:16:37 +0000 (05:16 +0000)]
Merge "Return local shard tree from FindPrimaryShard"
Tom Pantelis [Thu, 30 Apr 2015 03:05:10 +0000 (03:05 +0000)]
Merge "Add documentation in akka.conf on how to specify location of persistent data"
Tom Pantelis [Tue, 21 Apr 2015 20:09:20 +0000 (16:09 -0400)]
Return local shard tree from FindPrimaryShard
Added a new ShardLeaderStateChanged message that includes the Shard's
DataTree as an Optional. If the shard is the leader, it returns it's
local DataTree, oherwise returns absent.
The ShardManager now returns a LocalPrimaryShardFound response to
FindPrimary if the shard's DataTree is present. Otherwise it returns
RemotePrimaryShardFound (renamed from PrimaryFound).
Change-Id: I4413aacfff3d3d2ee89df7c4a3a1d7f7c3d2c486
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
(cherry picked from commit
fdddb482b07c3ee2f3ca853d09ee9a6ecdd7eb2a)
Maros Marsalek [Wed, 29 Apr 2015 14:45:58 +0000 (16:45 +0200)]
Fix mac address generator in stress client
Change-Id: Ibe016728fb2be3693c1b9f7899d0933932c37138
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Signed-off-by: Tomas Cere <tcere@cisco.com>
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Maros Marsalek [Wed, 29 Apr 2015 14:39:45 +0000 (16:39 +0200)]
Modify multiple physical address atributes in stress-client payload.
Change-Id: Ic719c519eb0735d00014e51851dd958db5098ff0
Signed-off-by: Tomas Cere <tcere@cisco.com>
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Maros Marsalek [Wed, 29 Apr 2015 14:37:04 +0000 (16:37 +0200)]
Multiple clients for stresstool
Added new parameter(--thread-amount) for stresstool that splits edits
between multiple threads.
Change-Id: I87a81a5442e32833c0c49dfd98b6475f8e699a2b
Signed-off-by: Tomas Cere <tcere@cisco.com>
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
bhavesh.kumar1 [Mon, 27 Apr 2015 04:18:44 +0000 (09:48 +0530)]
Bug222:Comments incorporated for response based Restconf statistics
Added response based restconf statistics which counts
the reponse of get, put, post and delete on the success and
failure response for config and operational datastore.
Change-Id: If423da08e2c5793e68398beb69575b7cf214f57e
Signed-off-by: bhavesh.kumar1 <bhavesh.kumar1@tcs.com>
Tomas Cere [Tue, 28 Apr 2015 09:09:50 +0000 (11:09 +0200)]
BUG 3066 : Optimistic lock failed, on NetconfStateUpdate
Fixed race condition between commit of NetconfState and
opening of a new transaction in NetconfMonitoring state update.
Change-Id: I2f56a0e432e630e56a35409c56e4198a3e278594
Signed-off-by: Tomas Cere <tcere@cisco.com>
Tomas Cere [Mon, 27 Apr 2015 14:02:32 +0000 (16:02 +0200)]
Add {PHYS_ADDR} attribute to netconf stress client tool
{PHYS_ADDR} is a wildcard and will be replaced by a physical address based on
current edit indes. Suitable for testing edit-config performance with models
containing physical address.
Change-Id: I48a0a6eb2ccf903dadc02c87d9eb9dfcfe7bac07
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Signed-off-by: Tomas Cere <tcere@cisco.com>
Thanh Ha [Wed, 29 Apr 2015 02:25:15 +0000 (22:25 -0400)]
Fix checkstyle violations caused by checkstyle 6.1.1
Change-Id: I84f356707f97184ae8708e429c6b440db8bd632f
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Ed Warnicke [Mon, 27 Apr 2015 19:17:38 +0000 (19:17 +0000)]
Merge "Bug 2983: Added support for creation of multiple list entries"
Tony Tkacik [Mon, 27 Apr 2015 08:34:09 +0000 (08:34 +0000)]
Merge "Event Source: switch from wildcards to regexs"
Tony Tkacik [Mon, 27 Apr 2015 08:30:18 +0000 (08:30 +0000)]
Merge "BUG 3029 - netconf event source modification - add TopicId into published notifications"
Martin Bobak [Sun, 26 Apr 2015 14:00:33 +0000 (16:00 +0200)]
Bug 3063 - Notification brokers does not properly scans notification listeners for implemented interfaces
Change-Id: Ie3b136bd40c443191d22bfbfd0ea532b65f717c2
Signed-off-by: Martin Bobak <mbobak@cisco.com>
Tom Pantelis [Fri, 24 Apr 2015 02:04:13 +0000 (22:04 -0400)]
Fix sal-akka-raft-example package directory
The sal-akka-raft-example component was created with package directory names
starting with "opendaylight.controller...". It should be
"org.opendaylight.controller...".
Change-Id: Ie6fa043fe83c8cff28bbd125eaeb79de811ca8b9
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
(cherry picked from commit
36955e19a84ad3e636c3343fec85c0cb9c3e49f6)
Moiz Raja [Thu, 26 Mar 2015 22:21:47 +0000 (15:21 -0700)]
Add documentation in akka.conf on how to specify location of persistent data
Change-Id: I085656d2b060aca2eae78dc85a9c0f660dcb9e3c
Signed-off-by: Moiz Raja <moraja@cisco.com>
(cherry picked from commit
7c209b8b08b56022b11c842c141d90d5b3d736e2)
Moiz Raja [Tue, 28 Apr 2015 18:15:51 +0000 (11:15 -0700)]
BUG 3054 : Check readiness status of datastore when receiving MemberUp.
A Follower knows who the Leader is when it receives an AppendEntries message,
however it does record the address of the leader, that is supplied by the
ShardManager when the ShardManager receives a MemberUp. The Follower cannot
be considered ready till it knows both who the leader is and what is it's
address. This patch ensures that the ShardManager counts down the readiness
latch only when the follower knows both.
This also ensures that FindPrimaryShard will only return a primary if the Leader
is truly known.
Change-Id: I1cd6b62124d50c9eca37368d0379b0c75168bb76
Signed-off-by: Moiz Raja <moraja@cisco.com>
(cherry picked from commit
bc5e040c7362243607e04045ac9d9309817bb9c1)
Moiz Raja [Tue, 28 Apr 2015 17:58:08 +0000 (10:58 -0700)]
BUG 3054 : Move ShardManager ready check into a single method.
Small refactoring to move code which checks for readiness into a
private method instead of duplicating it inline
Change-Id: I60cd603cb015c8602591769f1f931ae8580cfbd8
Signed-off-by: Moiz Raja <moraja@cisco.com>
(cherry picked from commit
7159b15b0efedb548f7fae5bb1eb9e970bc2e43f)
Tony Tkacik [Wed, 29 Apr 2015 16:57:29 +0000 (16:57 +0000)]
Merge "Bug 2932: NPE on bundle activation"
Marian Dubai [Wed, 22 Apr 2015 07:53:21 +0000 (09:53 +0200)]
Bug 2932: NPE on bundle activation
Error might occured when value containing YangStoreContext
is overwritten to null by refresh method, executed within another thread.
After fix, in case context is null, context is calculated again.
Change-Id: Icefe2a5970ec2ce0b67d5b3b386a35f781fc4156
Signed-off-by: Marian Dubai <mdubai@cisco.com>
Tony Tkacik [Fri, 24 Apr 2015 22:09:43 +0000 (22:09 +0000)]
Merge "Bumped controller version by minor for next release cycle."
Tony Tkacik [Fri, 24 Apr 2015 21:15:56 +0000 (21:15 +0000)]
Merge "Fix ReplicationAndSnapshotsIntegrationTest failure"
Tony Tkacik [Fri, 24 Apr 2015 12:59:07 +0000 (14:59 +0200)]
Bug 2983: Added support for creation of multiple list entries
JSON payload for POST allows user to specify multiple list
entries to be created. This resulted in confusing behaviour
where only one entry was allowed.
Updated RESTCONF to allow multiple entry creation via POST
for lists only.
Change-Id: I7dc11098676d4e761e1b31a0504f3e5af75157f3
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Moiz Raja [Fri, 24 Apr 2015 17:57:10 +0000 (17:57 +0000)]
Merge "Remove local override of odlparent version for org.eclipse.persistence.version"
Ed Warnicke [Fri, 24 Apr 2015 17:13:25 +0000 (10:13 -0700)]
Remove local override of odlparent version for org.eclipse.persistence.version
Change-Id: I297cc9ddae7958ba2d1c72c76e1b5b6d19ebc290
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
Tony Tkacik [Thu, 23 Apr 2015 14:19:33 +0000 (14:19 +0000)]
Bumped controller version by minor for next release cycle.
Change-Id: I80ea0aecf42e5ee96dcebc68af1e872b1f10e7b5
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Tom Pantelis [Fri, 24 Apr 2015 16:12:30 +0000 (16:12 +0000)]
Merge "NPE in RaftActor#onGetOnDemandRaftStats"
Tom Pantelis [Fri, 24 Apr 2015 15:57:37 +0000 (15:57 +0000)]
Merge "Fix NoSuchElementException thrown when transaction is empty"
Tony Tkacik [Fri, 24 Apr 2015 15:43:20 +0000 (15:43 +0000)]
Merge "Use ImmutableNodes.fromInstanceId in netconf"
Tomas Cere [Tue, 7 Apr 2015 13:49:33 +0000 (15:49 +0200)]
BUG 2954 : Thread local DocumentBuilder's for XmlUtil
Increases performance by reusing cached DocumentBuilder instances.
Change-Id: I5aab6b4caa960878b647e6868377d62dd6262cd9
Signed-off-by: Tomas Cere <tcere@cisco.com>
Tony Tkacik [Fri, 24 Apr 2015 15:42:27 +0000 (15:42 +0000)]
Merge "Improve performance of XmlElement.getName"
Tony Tkacik [Fri, 24 Apr 2015 15:30:23 +0000 (15:30 +0000)]
Merge "Fix test failure in TopologyManagerImplTest#testNotifyNodeConnector"
Moiz Raja [Fri, 24 Apr 2015 15:02:33 +0000 (08:02 -0700)]
Fix NoSuchElementException thrown when transaction is empty
Change-Id: I5d2c26a1ff3d8f5b8ace893b7206da2d23bf637c
Signed-off-by: Moiz Raja <moraja@cisco.com>
Moiz Raja [Fri, 24 Apr 2015 14:08:01 +0000 (14:08 +0000)]
Merge "Fix CloseTransactionChain NotSerializableException"