From: Michael Vorburger Date: Mon, 28 Aug 2017 15:27:17 +0000 (+0200) Subject: Bug 9060: Remove un-used Instant getObjectCreated() from CloseTracked X-Git-Tag: release/oxygen~121 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=c2b97e243117918acf5aa77d58ad5dc25d32c105 Bug 9060: Remove un-used Instant getObjectCreated() from CloseTracked I initially thought that it would be "interesting" to be able to do some sort of output sorted by the age of the object creating kind of UX in the CLI I'm planning to propose next, but ultimately realized that keeping an extra Instant fields in EACH CloseTracked (e.g. Tx) is just overhead and not really adding much value (because the NUMBER of non-closed objects is MUCH more interesting than this timestamp..), thus removing this again after all. This is one of a serious of commits which is part of a solution I'm proposing in order to be able to detect OOM issues such as Bug 9034, based on using the mdsal-trace DataBroker. Change-Id: Ie40fe23ce2af670902ff8e44a6757ebdf9ef915e Signed-off-by: Michael Vorburger --- diff --git a/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/closetracker/impl/AbstractCloseTracked.java b/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/closetracker/impl/AbstractCloseTracked.java index 59dbf5749d..aaafeb4bec 100644 --- a/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/closetracker/impl/AbstractCloseTracked.java +++ b/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/closetracker/impl/AbstractCloseTracked.java @@ -7,7 +7,6 @@ */ package org.opendaylight.controller.md.sal.trace.closetracker.impl; -import java.time.Instant; import javax.annotation.Nullable; /** @@ -27,11 +26,6 @@ public abstract class AbstractCloseTracked> im closeTracker.removeFromTrackedRegistry(); } - @Override - public final Instant getObjectCreated() { - return closeTracker.getObjectCreated(); - } - @Override public @Nullable StackTraceElement[] getAllocationContextStackTrace() { return closeTracker.getAllocationContextStackTrace(); diff --git a/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/closetracker/impl/CloseTracked.java b/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/closetracker/impl/CloseTracked.java index 1febe153ea..f5fd341b55 100644 --- a/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/closetracker/impl/CloseTracked.java +++ b/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/closetracker/impl/CloseTracked.java @@ -7,7 +7,6 @@ */ package org.opendaylight.controller.md.sal.trace.closetracker.impl; -import java.time.Instant; import javax.annotation.Nullable; /** @@ -19,8 +18,6 @@ import javax.annotation.Nullable; */ public interface CloseTracked> { - Instant getObjectCreated(); - @Nullable StackTraceElement[] getAllocationContextStackTrace(); } diff --git a/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/closetracker/impl/CloseTrackedTrait.java b/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/closetracker/impl/CloseTrackedTrait.java index f76eeb17c6..b846c042d1 100644 --- a/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/closetracker/impl/CloseTrackedTrait.java +++ b/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/closetracker/impl/CloseTrackedTrait.java @@ -7,7 +7,6 @@ */ package org.opendaylight.controller.md.sal.trace.closetracker.impl; -import java.time.Instant; import java.util.Objects; import javax.annotation.Nullable; @@ -23,12 +22,10 @@ import javax.annotation.Nullable; */ public class CloseTrackedTrait> implements CloseTracked { - private final Instant created; private final @Nullable Throwable allocationContext; private final CloseTrackedRegistry closeTrackedRegistry; public CloseTrackedTrait(CloseTrackedRegistry transactionChainRegistry) { - this.created = Instant.now(); if (transactionChainRegistry.isDebugContextEnabled()) { this.allocationContext = new Throwable("allocated at"); } else { @@ -38,11 +35,6 @@ public class CloseTrackedTrait> implements CloseTracke this.closeTrackedRegistry.add(this); } - @Override - public Instant getObjectCreated() { - return created; - } - @Override public StackTraceElement[] getAllocationContextStackTrace() { return allocationContext != null ? allocationContext.getStackTrace() : null; diff --git a/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingReadWriteTransaction.java b/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingReadWriteTransaction.java index 52f1dab509..fe57c8108d 100644 --- a/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingReadWriteTransaction.java +++ b/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingReadWriteTransaction.java @@ -10,7 +10,6 @@ package org.opendaylight.controller.md.sal.trace.dom.impl; import com.google.common.base.Optional; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.ListenableFuture; -import java.time.Instant; import java.util.Objects; import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; @@ -67,11 +66,6 @@ class TracingReadWriteTransaction return super.cancel(); } - @Override - public Instant getObjectCreated() { - return closeTracker.getObjectCreated(); - } - @Override public StackTraceElement[] getAllocationContextStackTrace() { return closeTracker.getAllocationContextStackTrace(); diff --git a/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingWriteTransaction.java b/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingWriteTransaction.java index 719944ad77..7e98e40e2a 100644 --- a/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingWriteTransaction.java +++ b/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingWriteTransaction.java @@ -9,7 +9,6 @@ package org.opendaylight.controller.md.sal.trace.dom.impl; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.ListenableFuture; -import java.time.Instant; import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; @@ -47,11 +46,6 @@ class TracingWriteTransaction extends AbstractTracingWriteTransaction return super.cancel(); } - @Override - public Instant getObjectCreated() { - return closeTracker.getObjectCreated(); - } - @Override public StackTraceElement[] getAllocationContextStackTrace() { return closeTracker.getAllocationContextStackTrace();