Merge branch 'testing'

SUNET · Dec 6, 2024 · 83e83f2 · 83e83f2
2 parents fa2994c + a528ae1
commit 83e83f2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/manifests/xrootd.pp b/manifests/xrootd.pp
@@ -36,10 +36,15 @@
     port          => $xrootd_port,
     iif           => $interface,
   }
+  if $role == 'server' {
+    $cms_ports = '32768-60999'
+  } else {
+    $cms_ports = $cms_port
+  }
   $cms_allow_hosts.each |$host| {
-    sunet::nftables::docker_expose { "cms_port_${cms_port}_${host['name']}":
+    sunet::nftables::docker_expose { "cms_ports_${host['name']}":
       allow_clients => [$host['ipv4'], $host['ipv6']],
-      port          => $cms_port,
+      port          => $cms_ports,
       iif           => $interface,
     }
   }

diff --git a/templates/xrootd/docker-compose.erb.yml b/templates/xrootd/docker-compose.erb.yml
@@ -19,8 +19,6 @@ services:
       - /opt/xrootd/admin:<%= @xrootd_admin_path %>:rw
       - /dev/log:/dev/log
     command: ["xrootd", "-c", "/etc/xrootd/xrootd.cfg"]
-    ports:
-      - "<%= @xrootd_port %>:<%= @xrootd_port %>"
     restart: always
   cmsd:
     image: <%= @container_image %>:<%= @container_tag %>
@@ -41,6 +39,4 @@ services:
       - /opt/xrootd/config:/etc/xrootd:ro
       - /opt/xrootd/admin:<%= @xrootd_admin_path %>:rw
       - /dev/log:/dev/log
-    command: ["cmsd", "-c", "/etc/xrootd/xrootd.cfg", "-p", "<%= @cms_port %>"]
-    ports:
-      - "<%= @cms_port %>:<%= @cms_port %>"
+    command: ["cmsd", "-c", "/etc/xrootd/xrootd.cfg"]
diff --git a/templates/xrootd/xrootd-manager.cfg.erb b/templates/xrootd/xrootd-manager.cfg.erb
@@ -24,7 +24,7 @@ all.role manager
 <% @cms_allow_hosts.each do |host| -%>
 cms.allow host <%= host['name'] %>
 <% end -%>
-cms.dfs limit 0 lookup distrib mdhold 0 redirect verify retries 2
+cms.dfs limit 0 lookup central mdhold 0 redirect immed retries 2
 
 # Bucket specific s3 options
 <% if @xrootd_buckets.is_a? Array and @xrootd_buckets.size > 0 -%>
@@ -57,9 +57,10 @@ s3.end
 # Global s3 options
 s3.url_style path
 # Debugging
-# s3.trace all
-# xrd.trace    all
-# xrootd.trace all dump
+s3.trace all
+xrd.trace    all
+cms.trace all
+xrootd.trace all dump
 # Setting up S3 plugin
 ofs.osslib libXrdS3.so
 
diff --git a/templates/xrootd/xrootd-server.cfg.erb b/templates/xrootd/xrootd-server.cfg.erb
@@ -24,7 +24,7 @@ all.role server
 <% @cms_allow_hosts.each do |host| -%>
 cms.allow host <%= host['name'] %>
 <% end -%>
-cms.dfs limit 0 lookup distrib mdhold 0 redirect verify retries 2
+cms.dfs limit 0 lookup central mdhold 0 redirect immed retries 2
 
 # Bucket specific s3 options
 <% if @xrootd_buckets.is_a? Array and @xrootd_buckets.size > 0 -%>
@@ -57,9 +57,10 @@ s3.end
 # Global s3 options
 s3.url_style path
 # Debugging
-# s3.trace all
-# xrd.trace    all
-# xrootd.trace all dump
+s3.trace all
+xrd.trace    all
+cms.trace all
+xrootd.trace all dump
 # Setting up S3 plugin
 ofs.osslib libXrdS3.so