You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/11 14:35:01 UTC
ignite git commit: IGNITE-3477 - Fixed cache metrics serialization
for .NET
Repository: ignite
Updated Branches:
refs/heads/ignite-3477-master c9fd6b997 -> e31969702
IGNITE-3477 - Fixed cache metrics serialization for .NET
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e3196970
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e3196970
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e3196970
Branch: refs/heads/ignite-3477-master
Commit: e319697023537237fb0c741dab9dba5cf08d5b83
Parents: c9fd6b9
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Apr 11 17:34:14 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Apr 11 17:35:21 2017 +0300
----------------------------------------------------------------------
.../dht/atomic/GridDhtAtomicCache.java | 37 ++++++++++----------
.../Impl/Cache/CacheMetricsImpl.cs | 10 ------
2 files changed, 19 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e3196970/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 5a8dfa0..6bcd6c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -3201,29 +3201,30 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
if (log.isDebugEnabled())
log.debug("Got removed entry while updating backup value (will retry): " + key);
- entry = null;
- }
- finally {
- if (entry != null)
- ctx.evicts().touch(entry, req.topologyVersion());
+ entry = null;
+ }
+ finally {
+ if (entry != null)
+ ctx.evicts().touch(entry, req.topologyVersion());
+ }
}
}
- }
- catch (NodeStoppingException e){
- U.error(log, "Failed to update key on backup (local node is stopping):" + key, e);
+ catch (NodeStoppingException e){
+ U.error(log, "Failed to update key on backup (local node is stopping):" + key, e);
- return;
- }
- catch (GridDhtInvalidPartitionException ignored) {
- // Ignore.
- }
- catch (IgniteCheckedException e) {
- IgniteCheckedException err = new IgniteCheckedException("Failed to update key on backup node: " + key, e);
+ return;
+ }
+ catch (GridDhtInvalidPartitionException ignored) {
+ // Ignore.
+ }
+ catch (IgniteCheckedException e) {
+ IgniteCheckedException err = new IgniteCheckedException("Failed to update key on backup node: " + key, e);
- if (nearRes != null)
- nearRes.addFailedKey(key, err);
+ if (nearRes != null)
+ nearRes.addFailedKey(key, err);
- U.error(log, "Failed to update key on backup node: " + key, e);}
+ U.error(log, "Failed to update key on backup node: " + key, e);
+ }
}
}
finally {
http://git-wip-us.apache.org/repos/asf/ignite/blob/e3196970/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/CacheMetricsImpl.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/CacheMetricsImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/CacheMetricsImpl.cs
index 48943b4..a2f0417 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/CacheMetricsImpl.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/CacheMetricsImpl.cs
@@ -266,7 +266,6 @@ namespace Apache.Ignite.Core.Impl.Cache
_cacheTxCommits = reader.ReadLong();
_cacheTxRollbacks = reader.ReadLong();
_cacheName = reader.ReadString();
- _overflowSize = reader.ReadLong();
_offHeapGets = reader.ReadLong();
_offHeapPuts = reader.ReadLong();
_offHeapRemovals = reader.ReadLong();
@@ -280,15 +279,6 @@ namespace Apache.Ignite.Core.Impl.Cache
_offHeapBackupEntriesCount = reader.ReadLong();
_offHeapAllocatedSize = reader.ReadLong();
_offHeapMaxSize = reader.ReadLong();
- _swapGets = reader.ReadLong();
- _swapPuts = reader.ReadLong();
- _swapRemovals = reader.ReadLong();
- _swapHits = reader.ReadLong();
- _swapMisses = reader.ReadLong();
- _swapEntriesCount = reader.ReadLong();
- _swapSize = reader.ReadLong();
- _swapHitPercentage = reader.ReadFloat();
- _swapMissPercentage = reader.ReadFloat();
_size = reader.ReadInt();
_keySize = reader.ReadInt();
_isEmpty = reader.ReadBoolean();