From 3f879f23aeaecd491148b5f4bb580f47eb777870 Mon Sep 17 00:00:00 2001 From: Gerd Behrmann Date: Mon, 5 Jan 2015 12:08:00 +0100 Subject: [PATCH] pool: Fix regression causing FTP movers to default to proxy mode A recent patch fixed a typo that had caused the pool.mover.ftp.allow-incoming-connections property to be ignored. Fixing the bug however revealed another bug that causes the interpretation of the property to be negated. Thus the mover defaulted to proxy mode. Target: trunk Request: 2.11 Request: 2.10 Request: 2.9 Request: 2.8 Request: 2.7 Require-notes: yes Require-book: no Acked-by: Paul Millar Patch: https://rb.dcache.org/r/7630/ (cherry picked from commit be20f110ef3d95b5e1d0cbc3140beaa1a50a30ac) --- .../main/java/org/dcache/pool/movers/GFtpProtocol_2_nio.java | 4 ++-- skel/share/services/pool.batch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/dcache-ftp/src/main/java/org/dcache/pool/movers/GFtpProtocol_2_nio.java b/modules/dcache-ftp/src/main/java/org/dcache/pool/movers/GFtpProtocol_2_nio.java index f1d435f2c8d..1a2abb4e851 100644 --- a/modules/dcache-ftp/src/main/java/org/dcache/pool/movers/GFtpProtocol_2_nio.java +++ b/modules/dcache-ftp/src/main/java/org/dcache/pool/movers/GFtpProtocol_2_nio.java @@ -210,9 +210,9 @@ public GFtpProtocol_2_nio(CellEndpoint cell) if (_cell != null) { Args args = _cell.getArgs(); - if (args.hasOption("ftpProxyPassive")) { + if (args.hasOption("ftpAllowIncomingConnections")) { _allowPassivePool = - !Boolean.parseBoolean(args.getOpt("ftpProxyPassive")); + Boolean.parseBoolean(args.getOpt("ftpAllowIncomingConnections")); } if (args.hasOption("gsiftpBlockSize")) { diff --git a/skel/share/services/pool.batch b/skel/share/services/pool.batch index 34a320f7d7d..60758290eff 100644 --- a/skel/share/services/pool.batch +++ b/skel/share/services/pool.batch @@ -90,7 +90,7 @@ create org.dcache.cells.UniversalSpringCell "${pool.cell.name}" \ "!PoolDefaults classpath:org/dcache/pool/classic/pool.xml \ -export=${pool.cell.export} -cellClass=Pool -profiles=healthcheck-${pool.enable.repository-check} \ -setupClass=pool -setupFile=\"${pool.path}/setup\" \ - -ftpProxyPassive=\"${pool.mover.ftp.allow-incoming-connections}\" \ + -ftpAllowIncomingConnections=\"${pool.mover.ftp.allow-incoming-connections}\" \ -allowMmap=\"${pool.mover.ftp.mmap}\" \ -messageExecutor=messageThreadPool \ -waitForFiles=\"${pool.wait-for-files}\" \