From c89c0d0ffd4016dbc7893f8921ad6bef8e1f0792 Mon Sep 17 00:00:00 2001
From: Paul Millar <paul.millar@desy.de>
Date: Mon, 25 Sep 2017 16:44:07 +0200
Subject: [PATCH] many: add diagnostic information about remote pool monitor

Motivation:

Many dCache components use RemotePoolMonitor to provide fast access to
the information that PoolManager has about pools.  In some cases,
accessing information to help diagnose problems is difficult or
impossible.

Modification:

Add information to the 'info' admin command that describes the current
status of the RemotePoolMonitor.

Result:

Hopefully more information when diagnosing problems to do with
remote-pool-monitor.

Target: master
Require-notes: yes
Require-book: yes
Request: 3.2
Request: 3.1
Request: 3.0
Request: 2.16
Patch: https://rb.dcache.org/r/10492/
Acked-by: Tigran Mkrtchyan

Conflicts:
	modules/dcache/src/main/java/org/dcache/poolmanager/RemotePoolMonitor.java
---
 .../dcache/poolmanager/RemotePoolMonitor.java | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/modules/dcache/src/main/java/org/dcache/poolmanager/RemotePoolMonitor.java b/modules/dcache/src/main/java/org/dcache/poolmanager/RemotePoolMonitor.java
index b436cf90b77..930ecc61b72 100644
--- a/modules/dcache/src/main/java/org/dcache/poolmanager/RemotePoolMonitor.java
+++ b/modules/dcache/src/main/java/org/dcache/poolmanager/RemotePoolMonitor.java
@@ -26,6 +26,7 @@
 import org.springframework.remoting.RemoteConnectFailureException;
 import org.springframework.remoting.RemoteProxyFailureException;
 
+import java.io.PrintWriter;
 import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
@@ -39,12 +40,16 @@
 
 import dmg.cells.nucleus.CellEvent;
 import dmg.cells.nucleus.CellEventListener;
+import dmg.cells.nucleus.CellEndpoint;
+import dmg.cells.nucleus.CellInfo;
+import dmg.cells.nucleus.CellInfoProvider;
 import dmg.cells.nucleus.CellLifeCycleAware;
 import dmg.cells.nucleus.CellMessageReceiver;
 import dmg.cells.nucleus.CellRoute;
 
 import org.dcache.cells.AbstractMessageCallback;
 import org.dcache.cells.CellStub;
+import org.dcache.util.TimeUtils;
 import org.dcache.vehicles.FileAttributes;
 
 import static org.dcache.util.MathUtils.addWithInfinity;
@@ -54,7 +59,7 @@
  * PoolMonitor that delegates to a PoolMonitor obtained from pool manager.
  */
 public class RemotePoolMonitor
-        implements PoolMonitor, CellLifeCycleAware, CellMessageReceiver, CellEventListener
+        implements PoolMonitor, CellLifeCycleAware, CellMessageReceiver, CellEventListener, CellInfoProvider
 {
     private static final Logger LOGGER = LoggerFactory.getLogger(RemotePoolMonitor.class);
 
@@ -102,6 +107,23 @@ public void routeDeleted(CellEvent ce)
     {
     }
 
+    public void getInfo(PrintWriter pw)
+    {
+        if (lastRefreshTime > 0) {
+            pw.println("last refreshed = " +
+                    TimeUtils.relativeTimestamp(lastRefreshTime, System.currentTimeMillis()));
+
+        }
+        pw.println("refresh count = " + refreshCount);
+        pw.println("active refresh target = " + poolManagerStub);
+    }
+
+    public CellInfo getCellInfo(CellInfo info)
+    {
+        return info;
+    }
+
+
     @Override
     public synchronized void afterStart()
     {