Skip to content

Commit

Permalink
pool: ftp mover suppresses including the IP address when out-of-storage
Browse files Browse the repository at this point in the history
Motivation:

Allow the OutOfDiskException message to travel to the door without
adding the client IP address as this is unnecessary.

Modification:

Bypass exception wrapping for OutOfDiskException.

Result:

More concised error message propagated back to the client.

Target: master
Require-notes: yes
Require-book: no
Patch: https://rb.dcache.org/r/11102/
Acked-by: Albert Rossi
  • Loading branch information
paulmillar committed Aug 23, 2018
1 parent 0a87fa7 commit 299b435
Showing 1 changed file with 3 additions and 0 deletions.
Expand Up @@ -45,6 +45,7 @@
import org.dcache.ftp.data.Role;
import org.dcache.pool.repository.FileStore;
import org.dcache.pool.repository.FileRepositoryChannel;
import org.dcache.pool.repository.OutOfDiskException;
import org.dcache.pool.repository.RepositoryChannel;
import org.dcache.util.Args;
import org.dcache.util.Checksum;
Expand Down Expand Up @@ -241,6 +242,8 @@ public void transfer(RepositoryChannel fileChannel, Role role, Mode mode)
PortUnreachableException | UnknownHostException e) {
throw Exceptions.wrap("Failed to connect " +
mode.getRemoteAddressDescription(), e, IOException.class);
} catch (OutOfDiskException e) {
throw e;
} catch (IOException e) {
throw Exceptions.wrap("Problem while connected to " +
mode.getRemoteAddressDescription(), e, IOException.class);
Expand Down

0 comments on commit 299b435

Please sign in to comment.