From 20b2ba67a79b1ec7f3d2fd58ed32f22ea54a1b59 Mon Sep 17 00:00:00 2001 From: Moiz Raja Date: Wed, 3 Dec 2014 05:20:33 -0800 Subject: [PATCH 1/1] BUG 2463 - Changing setting for shard-snapshot-data-threshold-percentage does not work This was missed by the commit which introduced this setting. It was not read from the config and set on the DataStoreContext. This meant that the default (12 percent) was used regardless of the actual setting. Also changed the name of the stat to InMemoryJournalDataSize instead of just DataSize to be more clear Change-Id: Iaffddb3e614db7a270d847ba219801e36c8a64e0 Signed-off-by: Moiz Raja --- .../org/opendaylight/controller/cluster/datastore/Shard.java | 2 +- .../cluster/datastore/jmx/mbeans/shard/ShardStats.java | 4 ++-- .../cluster/datastore/jmx/mbeans/shard/ShardStatsMXBean.java | 2 +- .../DistributedConfigDataStoreProviderModule.java | 1 + .../DistributedOperationalDataStoreProviderModule.java | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java index af16d02eea..a22e535fad 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java @@ -788,7 +788,7 @@ public class Shard extends RaftActor { shardMBean.setCommitIndex(getCommitIndex()); shardMBean.setLastApplied(getLastApplied()); - shardMBean.setDataSize(getRaftActorContext().getReplicatedLog().dataSize()); + shardMBean.setInMemoryJournalDataSize(getRaftActorContext().getReplicatedLog().dataSize()); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStats.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStats.java index 4fc2ed2d06..945ae0a478 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStats.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStats.java @@ -220,12 +220,12 @@ public class ShardStats extends AbstractMXBean implements ShardStatsMXBean { this.lastCommittedTransactionTime = lastCommittedTransactionTime; } - public void setDataSize(long dataSize){ + public void setInMemoryJournalDataSize(long dataSize){ this.dataSize = dataSize; } @Override - public long getDataSize(){ + public long getInMemoryJournalDataSize(){ return dataSize; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStatsMXBean.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStatsMXBean.java index 8174727788..9698f6fe22 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStatsMXBean.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardStatsMXBean.java @@ -52,5 +52,5 @@ public interface ShardStatsMXBean { void resetTransactionCounters(); - long getDataSize(); + long getInMemoryJournalDataSize(); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModule.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModule.java index 8eb653a44f..2db487952b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModule.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedConfigDataStoreProviderModule.java @@ -53,6 +53,7 @@ public class DistributedConfigDataStoreProviderModule extends .shardJournalRecoveryLogBatchSize(props.getShardJournalRecoveryLogBatchSize(). getValue().intValue()) .shardSnapshotBatchCount(props.getShardSnapshotBatchCount().getValue().intValue()) + .shardSnapshotDataThresholdPercentage(props.getShardSnapshotDataThresholdPercentage().getValue().intValue()) .shardHeartbeatIntervalInMillis(props.getShardHearbeatIntervalInMillis().getValue()) .shardInitializationTimeout(props.getShardInitializationTimeoutInSeconds().getValue(), TimeUnit.SECONDS) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java index 2a12aff4ef..866807e141 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/distributed_datastore_provider/DistributedOperationalDataStoreProviderModule.java @@ -53,6 +53,7 @@ public class DistributedOperationalDataStoreProviderModule extends .shardJournalRecoveryLogBatchSize(props.getShardJournalRecoveryLogBatchSize(). getValue().intValue()) .shardSnapshotBatchCount(props.getShardSnapshotBatchCount().getValue().intValue()) + .shardSnapshotDataThresholdPercentage(props.getShardSnapshotDataThresholdPercentage().getValue().intValue()) .shardHeartbeatIntervalInMillis(props.getShardHearbeatIntervalInMillis().getValue()) .shardInitializationTimeout(props.getShardInitializationTimeoutInSeconds().getValue(), TimeUnit.SECONDS) -- 2.36.6