Merge remote-tracking branch 'upstream/master'

mksahakyan · Mar 16, 2024 · 6c6b1a8 · 6c6b1a8
2 parents 111b700 + cbed2f0
commit 6c6b1a8
Show file tree

Hide file tree

Showing 86 changed files with 312 additions and 106 deletions.
diff --git a/archetypes/dcache-nearline-plugin-archetype/pom.xml b/archetypes/dcache-nearline-plugin-archetype/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.dcache</groupId>
         <artifactId>archetypes</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>10.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcache-nearline-plugin-archetype</artifactId>

diff --git a/archetypes/pom.xml b/archetypes/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.dcache</groupId>
         <artifactId>dcache-parent</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>10.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>archetypes</artifactId>

diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.dcache</groupId>
     <artifactId>documentation</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>TheBook</artifactId>

diff --git a/docs/TheBook/src/main/markdown/config-billing.md b/docs/TheBook/src/main/markdown/config-billing.md
@@ -25,6 +25,7 @@ If you installed dCache following the instructions in the Chapter [Installing dC
 ```
 
 Use the property `billing.text.dir` to set the location of the log files and the property `billing.enable.text` to control whether the plain-text log files are generated.
+To write the logs in JSON format instead of plain text, use the property `billing.format.json=true`.
 
 By default the log files are located in the directory
 `/var/lib/dcache/billing`. Under this directory the log files are

diff --git a/docs/UserGuide/pom.xml b/docs/UserGuide/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.dcache</groupId>
     <artifactId>documentation</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>UserGuide</artifactId>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.dcache</groupId>
     <artifactId>dcache-parent</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>documentation</artifactId>

diff --git a/modules/acl-vehicles/pom.xml b/modules/acl-vehicles/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.dcache</groupId>
     <artifactId>dcache-parent</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/modules/acl/pom.xml b/modules/acl/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.dcache</groupId>
     <artifactId>dcache-parent</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.dcache</groupId>
     <artifactId>dcache-parent</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/modules/cells/README.md b/modules/cells/README.md
@@ -0,0 +1,22 @@
+# Cell
+
+This module is responsible for inner-cell communication.
+
+
+## Celle messages
+
+```mermaid
+sequenceDiagram
+    
+    participant  Cell 'A'
+    create participant cellEndpoint
+    Cell 'A' ->>+cellEndpoint: send(message) to 'B'
+    
+    create participant CellMessageDispatcher
+    cellEndpoint ->>+CellMessageDispatcher:message
+    CellMessageDispatcher ->>+CellMessageDispatcher:find receiver
+    
+    participant  Cell 'B'
+    CellMessageDispatcher ->>+Cell 'B': messageArrived(message) from 'A'
+
+```
diff --git a/modules/cells/pom.xml b/modules/cells/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.dcache</groupId>
     <artifactId>dcache-parent</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/modules/cells/readme b/modules/cells/readme
diff --git a/modules/chimera/pom.xml b/modules/chimera/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.dcache</groupId>
     <artifactId>dcache-parent</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/modules/common-cli/pom.xml b/modules/common-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.dcache</groupId>
         <artifactId>dcache-parent</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>10.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/common-security/pom.xml b/modules/common-security/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.dcache</groupId>
         <artifactId>dcache-parent</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>10.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/common/pom.xml b/modules/common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.dcache</groupId>
     <artifactId>dcache-parent</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/modules/dcache-bulk/pom.xml b/modules/dcache-bulk/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.dcache</groupId>
     <artifactId>dcache-parent</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/modules/dcache-chimera/pom.xml b/modules/dcache-chimera/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.dcache</groupId>
     <artifactId>dcache-parent</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/modules/dcache-dcap/pom.xml b/modules/dcache-dcap/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.dcache</groupId>
     <artifactId>dcache-parent</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/modules/dcache-frontend/pom.xml b/modules/dcache-frontend/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.dcache</groupId>
         <artifactId>dcache-parent</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>10.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/dcache-ftp/pom.xml b/modules/dcache-ftp/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.dcache</groupId>
     <artifactId>dcache-parent</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/modules/dcache-gplazma/pom.xml b/modules/dcache-gplazma/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.dcache</groupId>
     <artifactId>dcache-parent</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/modules/dcache-history/pom.xml b/modules/dcache-history/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.dcache</groupId>
     <artifactId>dcache-parent</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/modules/dcache-info/pom.xml b/modules/dcache-info/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.dcache</groupId>
     <artifactId>dcache-parent</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/modules/dcache-info/src/main/java/org/dcache/services/info/gathers/LinkgroupListDga.java b/modules/dcache-info/src/main/java/org/dcache/services/info/gathers/LinkgroupListDga.java
@@ -48,7 +48,8 @@ public LinkgroupListDga(CellPath spacemanager, int interval, MessageHandlerChain
     public void trigger() {
         super.trigger();
         LOGGER.trace("Sending linkgroup list request message");
-        _mhc.sendMessage(_metricLifetime, _spacemanager, new GetLinkGroupNamesMessage());
+        _mhc.sendMessage(_metricLifetime, _spacemanager, triggerPeriod(),
+                new GetLinkGroupNamesMessage());
     }
 
 

diff --git a/modules/dcache-info/src/main/java/org/dcache/services/info/gathers/ListBasedMessageDga.java b/modules/dcache-info/src/main/java/org/dcache/services/info/gathers/ListBasedMessageDga.java
@@ -69,7 +69,8 @@ public void trigger() {
         sb.append(" ");
         sb.append(item);
 
-        _sender.sendMessage(getMetricLifetime(), _handler, _cellPath, sb.toString());
+        _sender.sendMessage(getMetricLifetime(), _handler, _cellPath,
+                listRefreshPeriod(), sb.toString());
     }
 
     @Override

diff --git a/modules/dcache-info/src/main/java/org/dcache/services/info/gathers/MessageHandlerChain.java b/modules/dcache-info/src/main/java/org/dcache/services/info/gathers/MessageHandlerChain.java
@@ -18,6 +18,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,11 +43,6 @@ public class MessageHandlerChain implements MessageMetadataRepository<UOID>,
     private static final long METADATA_FLUSH_THRESHOLD = 3600000; // 1 hour
     private static final long METADATA_FLUSH_PERIOD = 600000; // 10 minutes
 
-    /**
-     * Our default timeout for sending messages, in milliseconds
-     */
-    private static final long STANDARD_TIMEOUT = 1000;
-
     private static final Logger LOGGER = LoggerFactory.getLogger(MessageHandlerChain.class);
     private final List<MessageHandler> _messageHandler = new LinkedList<>();
     private CellEndpoint _endpoint;
@@ -83,18 +79,19 @@ public String[] listMessageHandlers() {
      * @param ttl           lifetime of resulting metric, in seconds.
      * @param handler       the call-back handler for the return message
      * @param path          the CellPath to target cell
+     * @param timeout       the time to wait for a response, in milliseconds
      * @param requestString the String, requesting information
      */
     @Override
     public void sendMessage(long ttl, CellMessageAnswerable handler,
-          CellPath path, String requestString) {
+          CellPath path, long timeout, String requestString) {
         if (handler == null) {
             LOGGER.error("ignoring attempt to send string-based message without call-back");
             return;
         }
 
         CellMessage envelope = new CellMessage(path, requestString);
-        sendMessage(ttl, handler, envelope);
+        sendMessage(ttl, handler, timeout, envelope);
     }
 
 
@@ -103,12 +100,13 @@ public void sendMessage(long ttl, CellMessageAnswerable handler,
      *
      * @param ttl     lifetime of resulting metric, in seconds.
      * @param path    the CellPath for the recipient of this message
+     * @param timeout the time to wait for a response, in milliseconds
      * @param message the Message payload
      */
     @Override
-    public void sendMessage(long ttl, CellPath path, Message message) {
+    public void sendMessage(long ttl, CellPath path, long timeout, Message message) {
         CellMessage envelope = new CellMessage(path, message);
-        sendMessage(ttl, null, envelope);
+        sendMessage(ttl, null, timeout, envelope);
     }
 
 
@@ -117,15 +115,16 @@ public void sendMessage(long ttl, CellPath path, Message message) {
      *
      * @param ttl      the metadata for the message
      * @param handler  the call-back for this method, or null if none should be used.
+     * @param timeout  the time to wait for a response, in milliseconds
      * @param envelope the message to send
      * @throws SerializationException if the payload isn't serialisable.
      */
     @Override
     public void sendMessage(long ttl, CellMessageAnswerable handler,
-          CellMessage envelope) throws SerializationException {
+          long timeout, CellMessage envelope) throws SerializationException {
         putMetricTTL(envelope.getUOID(), ttl);
         _endpoint.sendMessage(envelope, handler != null ? handler : this,
-              MoreExecutors.directExecutor(), STANDARD_TIMEOUT);
+              MoreExecutors.directExecutor(), timeout);
     }
 
     public void setHandlers(List<MessageHandler> handlers) {

diff --git a/modules/dcache-info/src/main/java/org/dcache/services/info/gathers/MessageSender.java b/modules/dcache-info/src/main/java/org/dcache/services/info/gathers/MessageSender.java
@@ -19,9 +19,10 @@ public interface MessageSender {
      *
      * @param ttl     how long, in seconds, resulting metrics should last
      * @param path    the destination for this request
+     * @param timeout the number of milliseconds to wait for a response.
      * @param message the vehicle to send
      */
-    void sendMessage(long ttl, CellPath path, Message message);
+    void sendMessage(long ttl, CellPath path, long timeout, Message message);
 
     /**
      * Send some arbitrary CellMessage (which includes the payload and the target Cell). The
@@ -33,9 +34,10 @@ public interface MessageSender {
      *
      * @param ttl      how long, in seconds, resulting metrics should last
      * @param handler  the object that is to receive reply message
+     * @param timeout the number of milliseconds to wait for a response.
      * @param envelope the complete message envelope to send
      */
-    void sendMessage(long ttl, CellMessageAnswerable handler,
+    void sendMessage(long ttl, CellMessageAnswerable handler, long timeout,
           CellMessage envelope);
 
     /**
@@ -49,8 +51,9 @@ void sendMessage(long ttl, CellMessageAnswerable handler,
      * @param ttl           how long, in seconds, resulting metrics should last
      * @param handler       the object that is to receive reply message
      * @param path          the destination for this request
+     * @param timeout the number of milliseconds to wait for a response.
      * @param requestString the String sent to the cell's shell
      */
     void sendMessage(long ttl, CellMessageAnswerable handler, CellPath path,
-          String requestString);
+          long timeout, String requestString);
 }
diff --git a/modules/dcache-info/src/main/java/org/dcache/services/info/gathers/SingleMessageDga.java b/modules/dcache-info/src/main/java/org/dcache/services/info/gathers/SingleMessageDga.java
@@ -78,9 +78,11 @@ public void trigger() {
         super.trigger();
 
         if (_requestMessage != null) {
-            _sender.sendMessage(metricLifetime(), null, new CellMessage(_target, _requestMessage));
+            _sender.sendMessage(metricLifetime(), null, triggerPeriod(),
+                    new CellMessage(_target, _requestMessage));
         } else {
-            _sender.sendMessage(metricLifetime(), _handler, _target, _requestString);
+            _sender.sendMessage(metricLifetime(), _handler, _target,
+                    triggerPeriod(), _requestString);
         }
     }