dCache · marian-babik · Jul 12, 2024 · Sep 27, 2024 · Oct 14, 2024 · Oct 15, 2024
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.2.0-SNAPSHOT</version>
+        <version>10.2.12</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.2.0-SNAPSHOT</version>
+        <version>10.2.12</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.2.0-SNAPSHOT</version>
+    <version>10.2.12</version>
   </parent>
 
   <artifactId>TheBook</artifactId>

diff --git a/docs/TheBook/src/main/markdown/cookbook-debugging.md b/docs/TheBook/src/main/markdown/cookbook-debugging.md
@@ -4,7 +4,7 @@ This chapter provides an information on how to exam running dCache system, ident
 
 ## Java Flight recorder
 
-When debugging an issue on a running system often we need to collect jvm performance stats with `Java flight recorder`. Starting from release 7.2 the Java flight recorder attach listener is enabled by default. Site admins can collect and provide developers with additional information when high CPU load, memory consumption or file descriptor leaks are observed. To enable the `flight recorder` _jcmd_ command is used, which is typically provided as a part of `java-11-openjdk-devel` (on RHEL and clones).
+When debugging an issue on a running system often we need to collect jvm performance stats with `Java flight recorder`. Starting from release 7.2 the Java flight recorder attach listener is enabled by default. Site admins can collect and provide developers with additional information when high CPU load, memory consumption or file descriptor leaks are observed. To enable the `flight recorder` _jcmd_ command is used, which is typically provided as a part of `java-17-openjdk-headless` (on RHEL and clones).
 
 To control recoding the following subcommands of _jcmd_ available:
 
@@ -111,4 +111,4 @@ Overhead  Shared Object         Symbol
    0.74%  [kernel]              [k] entry_SYSCALL_64
 ```
 
-More info on usage perf usage at [perf Examples](https://www.brendangregg.com/perf.html) by Brendan Gregg.
+More info on usage perf usage at [perf Examples](https://www.brendangregg.com/perf.html) by Brendan Gregg.
diff --git a/docs/TheBook/src/main/markdown/dcache-minimal-installation.md b/docs/TheBook/src/main/markdown/dcache-minimal-installation.md
@@ -29,7 +29,7 @@ For a minimal test installation:
   - At least 500 MiB free disk space
 
 - Software:
-  - OpenJDK 11
+  - OpenJDK 17
   - Postgres SQL Server 9.5 or later
   - ZooKeeper version 3.5 (in case of a standalone ZooKeeper installation)
 
@@ -40,11 +40,11 @@ help you with your system specifications. Just contact us: <[email protected]>.
 
 #### Software:
 
-- OpenJDK 11 (java 11 , and java 17 for dCache staring from version 10.1)
+- OpenJDK 17 (or OpenJDK 11 for dCache versions before 10.1)
 
- > yum install java-11-openjdk
+ > yum install java-17-openjdk
  > 
- > dnf install java-11-openjdk-devel
+ > dnf install java-17-openjdk-devel
 
 
 - ZooKeeper version 3.7 (in case of a standalone ZooKeeper installation)

diff --git a/docs/TheBook/src/main/markdown/install.md b/docs/TheBook/src/main/markdown/install.md
@@ -74,14 +74,14 @@ rpm -ivh https://www.dcache.org/old/downloads/1.9/repo/##SERIES##/dcache-##VERSI
 |   1:dcache-##VERSION##-1                   ################################# [100%]
 ```
 
-For example, `##SERIES##` could be `9.1` and `##VERSION##` could be `9.1.1`.
+For example, `##SERIES##` could be `10.1` and `##VERSION##` could be `10.1.1`.
 
 ### Installing prerequisite packages
 
 First, install OpenJDK and httpd-tools packages.
 
 ```console-root
-yum install java-11-openjdk-headless httpd-tools
+dnf install java-17-openjdk-headless httpd-tools
 ```
 
 ### Installing PostgreSQL

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.2.0-SNAPSHOT</version>
+    <version>10.2.12</version>
   </parent>
 
   <artifactId>UserGuide</artifactId>

diff --git a/docs/UserGuide/src/main/markdown/macaroons.md b/docs/UserGuide/src/main/markdown/macaroons.md
@@ -168,8 +168,8 @@ has a couple of important consequences:
 
 dCache defines seven activities that describe what someone using the
 macaroon is allowed to do.  These are `READ_METADATA`,
-`UPDATE_METADATA`, `LIST`, `DOWNLOAD`, `MANAGE`, `UPLOAD` and
-`DELETE`,
+`UPDATE_METADATA`, `LIST`, `DOWNLOAD`, `MANAGE`, `UPLOAD`,
+`DELETE` and `STAGE`.
 
 <dl>
   <dt>READ_METADATA</dt>
@@ -186,7 +186,7 @@ macaroon is allowed to do.  These are `READ_METADATA`,
   <dd>
     <p>Any request that attempts to update the metadata about the
     file: modifying the POSIX permissions, updating ACLs, updating
-    extended attributes, updating QoS or locality (staging).</p>
+    extended attributes, updating QoS.</p>
   </dd>
 
   <dt>LIST</dt>
@@ -231,6 +231,12 @@ macaroon is allowed to do.  These are `READ_METADATA`,
     inaccessible from one path but accessible from another is namespace
     management (see MANAGE activity).</p>
   </dd>
+
+  <dt>STAGE</dt>
+
+  <dd>
+    <p>Any request that stages (restores) files from tape.</p>
+  </dd>
 </dl>
 
 The following describes how HTTP requests are mapped to different

diff --git a/docs/UserGuide/src/main/markdown/webdav.md b/docs/UserGuide/src/main/markdown/webdav.md
@@ -1354,7 +1354,8 @@ activities are defined:
 | DELETE          | Delete a file or directory or overwrite an existing file
 | MANAGE          | Rename and move files or directories
 | READ_METADATA   | Obtain file metadata
-| UPDATE_METADATA | Modify file metadata, stage a file or change its QoS
+| UPDATE_METADATA | Modify file metadata, change its QoS
+| STAGE           | Stage (restore) a file from tape
 
 The <tt>READ_METADATA</tt> is implied if any other activity is specified.
 For example, the caveat <tt>activity:LIST,DOWNLOAD</tt> restricts the

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.2.0-SNAPSHOT</version>
+    <version>10.2.12</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.2.0-SNAPSHOT</version>
+    <version>10.2.12</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.2.0-SNAPSHOT</version>
+    <version>10.2.12</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.2.0-SNAPSHOT</version>
+    <version>10.2.12</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

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.2.0-SNAPSHOT</version>
+    <version>10.2.12</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/modules/cells/src/main/java/dmg/cells/network/LocationManagerConnector.java b/modules/cells/src/main/java/dmg/cells/network/LocationManagerConnector.java
@@ -54,8 +54,8 @@ public LocationManagerConnector(String cellName, String args, SocketFactory sock
     @Override
     protected void started() {
         _thread = getNucleus().newThread(this, "TunnelConnector-" + _domain);
-        _thread.start();
         _isRunning = true;
+        _thread.start();
     }
 
     private StreamEngine connect()
@@ -102,8 +102,8 @@ public void run() {
                     } finally {
                         getNucleus().kill(tunnel.getCellName());
                     }
-                } catch (InterruptedIOException | ClosedByInterruptException e) {
-                    throw e;
+                } catch (InterruptedIOException | InterruptedException | ClosedByInterruptException e) {
+                    _log.warn("Connection to {} ({}) interrupted. Reason: {}", _domain, _address, e.toString());
                 } catch (ExecutionException | IOException e) {
                     String error = Exceptions.meaningfulMessage(Throwables.getRootCause(e));
                     _log.warn(AlarmMarkerFactory.getMarker(PredefinedAlarm.LOCATION_MANAGER_FAILURE,
@@ -116,11 +116,16 @@ public void run() {
                 _status = "Sleeping";
                 long sleep = random.nextInt(16000) + 4000;
                 _log.warn("Sleeping {} seconds", sleep / 1000);
-                Thread.sleep(sleep);
+                try {
+                    Thread.sleep(sleep);
+                } catch (InterruptedException e) {
+                    // restore interrupted status
+                    Thread.currentThread().interrupt();
+                }
             }
-        } catch (InterruptedIOException | InterruptedException | ClosedByInterruptException ignored) {
         } finally {
             NDC.pop();
+            _thread = null;
             _status = "Terminated";
         }
     }

diff --git a/modules/cells/src/main/java/dmg/cells/services/LocationManager.java b/modules/cells/src/main/java/dmg/cells/services/LocationManager.java
@@ -67,6 +67,7 @@
 import org.apache.curator.framework.recipes.cache.NodeCacheListener;
 import org.apache.curator.framework.recipes.cache.PathChildrenCache;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
+import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent.Type;
 import org.apache.curator.utils.CloseableUtils;
 import org.apache.curator.utils.ZKPaths;
 import org.apache.zookeeper.CreateMode;
@@ -216,7 +217,9 @@ public CoreDomainInfo(byte[] bytes) {
                     switch (entry.getScheme()) {
                         case "tls":
                         case "tcp":
-                            endpoints.add(entry);
+                            if (canResoveHost(entry)) {
+                                endpoints.add(entry);
+                            }
                             break;
                         default:
                             LOGGER.warn("Unknown Scheme for LocationManager Cores: {}", entry);
@@ -225,10 +228,30 @@ public CoreDomainInfo(byte[] bytes) {
                 }
             } catch (IOException ie) {
                 throw new IllegalArgumentException(
-                      "Failed deserializing LocationManager Cores as uri: {}", ie.getCause());
+                      "Failed deserializing LocationManager Cores as uri", ie);
             }
         }
 
+        /**
+         * Check if hostname provided by urc can be resolved.
+         * @param endpoint core domain endpoint
+         * @return true it host name can be resolved. Otherwise false.
+         */
+        private boolean canResoveHost(URI endpoint) {
+            var h = endpoint.getHost();
+            if (h == null) {
+                LOGGER.warn("Ignoring URL without host: {}", endpoint);
+                return false;
+            }
+            try {
+                var ip = java.net.InetAddress.getByName(h);
+            } catch (UnknownHostException e) {
+                LOGGER.warn("Ignoring unknown host: {} : {}", endpoint, e.toString());
+                return false;
+            }
+            return true;
+        }
+
         void addCore(String scheme, String host, int port) {
             switch (scheme) {
                 case "tls":
@@ -513,40 +536,46 @@ public void close() {
         public void reset(Mode mode, State state) {
         }
 
+        private boolean hasNoData(ChildData data) {
+            return data == null || data.getData() == null || data.getData().length == 0;
+        }
+
         public void update(PathChildrenCacheEvent event) {
             LOGGER.info("{}", event);
             String cell;
 
+            if (hasNoData(event.getData())) {
+                LOGGER.warn("Ignoring empty event {}", event.getType());
+                return;
+            }
+
+            String domain = ZKPaths.getNodeFromPath(event.getData().getPath());
+
             switch (event.getType()) {
                 case CHILD_REMOVED:
-                    cell = connectors.remove(ZKPaths.getNodeFromPath(event.getData().getPath()));
+                    cell = connectors.remove(domain);
                     if (cell != null) {
                         killConnector(cell);
                     }
                     break;
                 case CHILD_UPDATED:
-                    cell = connectors.remove(ZKPaths.getNodeFromPath(event.getData().getPath()));
-                    if (cell != null) {
-                        killConnector(cell);
-                    }
-                    // fall through
                 case CHILD_ADDED:
-                    //Log if the Core Domain Information received is incompatible with previous
+
                     CoreDomainInfo info = infoFromZKEvent(event);
-                    String domain = ZKPaths.getNodeFromPath(event.getData().getPath());
+                    if (info.endpoints.isEmpty()) {
+                        LOGGER.warn("Ignoring invalid core URI", domain);
+                        break;
+                    }
+
+                    if (event.getType() == Type.CHILD_UPDATED) {
+                        cell = connectors.remove(domain);
+                        if (cell != null) {
+                            killConnector(cell);
+                        }
+                    }
 
                     try {
                         if (shouldConnectTo(domain)) {
-                            cell = connectors.remove(domain);
-                            if (cell != null) {
-                                LOGGER.error(
-                                      "About to create tunnel to core domain {}, but to my surprise "
-                                            +
-                                            "a tunnel called {} already exists. Will kill it. Please contact "
-                                            +
-                                            "[email protected].", domain, cell);
-                                killConnector(cell);
-                            }
                             cell = connectors.put(domain, startConnector(domain, info));
                             if (cell != null) {
                                 LOGGER.error(

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.2.0-SNAPSHOT</version>
+    <version>10.2.12</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.2.0-SNAPSHOT</version>
+        <version>10.2.12</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.2.0-SNAPSHOT</version>
+        <version>10.2.12</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.2.0-SNAPSHOT</version>
+    <version>10.2.12</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.2.0-SNAPSHOT</version>
+    <version>10.2.12</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>