Skip to content

Commit

Permalink
several: remove non-ASCII dash occurrences
Browse files Browse the repository at this point in the history 
Motivation:
Review Board keeps complaining about detected non-ASCII characters, suspecting malicious code. IntelliJ highlights them as well.

Modification:
Change en dash U+2013 to regular dash.

Result:
No admin- or user-observable changes.

Target: master
Requires-notes: no
Requires-book: no
Patch: https://rb.dcache.org/r/14008/
Acked-by: Paul Millar
  • Loading branch information
@lemora
lemora committed Jun 30, 2023
1 parent 9eae61b commit ad26320
Show file tree
Hide file tree
Showing 23 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion docs/TheBook/src/main/markdown/config-alarms.md
View file
Expand Up @@ -73,7 +73,7 @@ how much history is to be preserved. While the XML option is more lightweight
and easier to configure, it is limited by performance, experiencing considerable
read and write slowdown as the file fills (beyond 1000 entries or so).
If you do not need to maintain records of alarms (and either manually delete
alarms which have been serviced, or use the built-in cleanup feature – see below),
alarms which have been serviced, or use the built-in cleanup feature - see below),
then this option should be sufficient. Otherwise, the extra steps of installing
postgreSQL on the appropriate node and creating the alarms database (as above)
may be worth the effort.
Expand Down
20 changes: 10 additions & 10 deletions docs/TheBook/src/main/markdown/config-qos-engine.md
View file
Expand Up @@ -36,7 +36,7 @@ The QoS service is actually made up of four different components.
the bulk service (also accessible through the REST API). The engine also
manages the logic, or rules, for determining what a file's QoS is.
1. the ``QoS Verifier``: This used to be the heart of the Resilience service.
It is now responsible only for verification––that is, determining the state of
It is now responsible only for verification--that is, determining the state of
a file and what needs to be done to make it satisfy its specified QoS.
The operations are now maintained in a database for reliable survival on restart, and
the component assures that enough iterations over the file will occur
Expand Down Expand Up @@ -585,10 +585,10 @@ of any pool scan operations:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[fndcatemp2] (qos@qosDomain) admin > pool ls
[fndcatemp2] (qos-scanner@qosSDomain) admin > pool ls
dcatest03-1 (completed: 0 / 0 : ?%) – (updated: 2022/04/29 13:54:52)(finished: 2022/04/29 13:54:52)(prev UNINITIALIZED)(curr UNINITIALIZED)(IDLE)
dcatest03-2 (completed: 0 / 0 : ?%) – (updated: 2022/04/29 13:54:52)(finished: 2022/04/29 13:54:52)(prev UNINITIALIZED)(curr UNINITIALIZED)(IDLE)
dcatest03-3 (completed: 0 / 0 : ?%) – (updated: 2022/04/29 13:54:52)(finished: 2022/04/29 13:54:52)(prev UNINITIALIZED)(curr UNINITIALIZED)(IDLE)
dcatest03-4 (completed: 0 / 0 : ?%) – (updated: 2022/04/29 13:54:52)(finished: 2022/04/29 13:54:52)(prev UNINITIALIZED)(curr UNINITIALIZED)(IDLE)
dcatest03-1 (completed: 0 / 0 : ?%) - (updated: 2022/04/29 13:54:52)(finished: 2022/04/29 13:54:52)(prev UNINITIALIZED)(curr UNINITIALIZED)(IDLE)
dcatest03-2 (completed: 0 / 0 : ?%) - (updated: 2022/04/29 13:54:52)(finished: 2022/04/29 13:54:52)(prev UNINITIALIZED)(curr UNINITIALIZED)(IDLE)
dcatest03-3 (completed: 0 / 0 : ?%) - (updated: 2022/04/29 13:54:52)(finished: 2022/04/29 13:54:52)(prev UNINITIALIZED)(curr UNINITIALIZED)(IDLE)
dcatest03-4 (completed: 0 / 0 : ?%) - (updated: 2022/04/29 13:54:52)(finished: 2022/04/29 13:54:52)(prev UNINITIALIZED)(curr UNINITIALIZED)(IDLE)
...
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -901,7 +901,7 @@ status ENABLED
last update Thu Jun 16 09:24:21 CDT 2016
\s qos-scanner pool ls rw-dmsdca24-1
rw-dmsdca24-1 (completed: 0 / 0 : ?%) – (updated: Thu Jun 16 09:25:42 CDT 2016)(scanned: Thu Jun 16 09:25:42 CDT 2016)(prev ENABLED)(curr ENABLED)(IDLE)
rw-dmsdca24-1 (completed: 0 / 0 : ?%) - (updated: Thu Jun 16 09:25:42 CDT 2016)(scanned: Thu Jun 16 09:25:42 CDT 2016)(prev ENABLED)(curr ENABLED)(IDLE)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

When the pool is added, a scan is scheduled for it, provided it is in an
Expand Down Expand Up @@ -929,16 +929,16 @@ We observe the pool has been queued for a scan:

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
\s qos-scanner pool ls rw-
rw-dmsdca24-2 (completed: 0 / 0 : ?%) – (updated: Thu Jun 16 17:17:09 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev ENABLED)(curr ENABLED)(WAITING)
rw-dmsdca24-3 (completed: 0 / 0 : ?%) – (updated: Thu Jun 16 17:14:33 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev UNINITIALIZED)(curr ENABLED)(IDLE)
rw-dmsdca24-4 (completed: 0 / 0 : ?%) – (updated: Thu Jun 16 17:14:33 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev UNINITIALIZED)(curr ENABLED)(IDLE)
rw-dmsdca24-2 (completed: 0 / 0 : ?%) - (updated: Thu Jun 16 17:17:09 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev ENABLED)(curr ENABLED)(WAITING)
rw-dmsdca24-3 (completed: 0 / 0 : ?%) - (updated: Thu Jun 16 17:14:33 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev UNINITIALIZED)(curr ENABLED)(IDLE)
rw-dmsdca24-4 (completed: 0 / 0 : ?%) - (updated: Thu Jun 16 17:14:33 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev UNINITIALIZED)(curr ENABLED)(IDLE)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

When the scan starts, we can see it is doing some work:

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
\s qos-scanner pool ls rw-dmsdca24-2
rw-dmsdca24-2 (completed: 491 / ? : ?%) – (updated: Thu Jun 16 17:17:19 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev ENABLED)(curr ENABLED)(RUNNING)
rw-dmsdca24-2 (completed: 491 / ? : ?%) - (updated: Thu Jun 16 17:17:19 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev ENABLED)(curr ENABLED)(RUNNING)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Because this is a demo pool, there aren't many files, so the scan completes
Expand Down
24 changes: 12 additions & 12 deletions docs/TheBook/src/main/markdown/config-resilience.md
View file
Expand Up @@ -460,10 +460,10 @@ scan operations:

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[fndcatemp2] (Resilience@resilienceDomain) admin > pool ls dmsdca17
dmsdca17-2 (completed: 0 / 0 : ?%) – (updated: Mon Jun 06 14:47:33 CDT 2016)(scanned: Mon Jun 06 14:47:33 CDT 2016)(prev ENABLED)(curr ENABLED)(IDLE)
dmsdca17-1 (completed: 0 / 0 : ?%) – (updated: Mon Jun 06 15:01:55 CDT 2016)(scanned: Mon Jun 06 15:01:55 CDT 2016)(prev ENABLED)(curr ENABLED)(IDLE)
dmsdca17-1.1 (completed: 0 / 0 : ?%) – (updated: Mon Jun 06 15:20:32 CDT 2016)(scanned: Mon Jun 06 15:20:32 CDT 2016)(prev ENABLED)(curr ENABLED)(IDLE)
dmsdca17-2.1 (completed: 0 / 0 : ?%) – (updated: Mon Jun 06 17:53:23 CDT 2016)(scanned: Mon Jun 06 17:53:23 CDT 2016)(prev ENABLED)(curr ENABLED)(IDLE)
dmsdca17-2 (completed: 0 / 0 : ?%) - (updated: Mon Jun 06 14:47:33 CDT 2016)(scanned: Mon Jun 06 14:47:33 CDT 2016)(prev ENABLED)(curr ENABLED)(IDLE)
dmsdca17-1 (completed: 0 / 0 : ?%) - (updated: Mon Jun 06 15:01:55 CDT 2016)(scanned: Mon Jun 06 15:01:55 CDT 2016)(prev ENABLED)(curr ENABLED)(IDLE)
dmsdca17-1.1 (completed: 0 / 0 : ?%) - (updated: Mon Jun 06 15:20:32 CDT 2016)(scanned: Mon Jun 06 15:20:32 CDT 2016)(prev ENABLED)(curr ENABLED)(IDLE)
dmsdca17-2.1 (completed: 0 / 0 : ?%) - (updated: Mon Jun 06 17:53:23 CDT 2016)(scanned: Mon Jun 06 17:53:23 CDT 2016)(prev ENABLED)(curr ENABLED)(IDLE)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

For each operation, the timestamps of the last update (change in status) and of
Expand Down Expand Up @@ -764,7 +764,7 @@ status ENABLED
last update Thu Jun 16 09:24:21 CDT 2016
[fndcatemp2] (Resilience@resilienceDomain) admin > pool ls rw-dmsdca24-1
rw-dmsdca24-1 (completed: 0 / 0 : ?%) – (updated: Thu Jun 16 09:25:42 CDT 2016)(scanned: Thu Jun 16 09:25:42 CDT 2016)(prev ENABLED)(curr ENABLED)(IDLE)
rw-dmsdca24-1 (completed: 0 / 0 : ?%) - (updated: Thu Jun 16 09:25:42 CDT 2016)(scanned: Thu Jun 16 09:25:42 CDT 2016)(prev ENABLED)(curr ENABLED)(IDLE)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

When the pool is added, a scan is scheduled for it, provided it is in an
Expand All @@ -789,9 +789,9 @@ We observe the pool has been queued for a scan:

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[fndcatemp2] (Resilience@resilienceDomain) admin > pool ls rw-
rw-dmsdca24-2 (completed: 0 / 0 : ?%) – (updated: Thu Jun 16 17:17:09 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev ENABLED)(curr ENABLED)(WAITING)
rw-dmsdca24-3 (completed: 0 / 0 : ?%) – (updated: Thu Jun 16 17:14:33 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev UNINITIALIZED)(curr ENABLED)(IDLE)
rw-dmsdca24-4 (completed: 0 / 0 : ?%) – (updated: Thu Jun 16 17:14:33 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev UNINITIALIZED)(curr ENABLED)(IDLE)
rw-dmsdca24-2 (completed: 0 / 0 : ?%) - (updated: Thu Jun 16 17:17:09 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev ENABLED)(curr ENABLED)(WAITING)
rw-dmsdca24-3 (completed: 0 / 0 : ?%) - (updated: Thu Jun 16 17:14:33 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev UNINITIALIZED)(curr ENABLED)(IDLE)
rw-dmsdca24-4 (completed: 0 / 0 : ?%) - (updated: Thu Jun 16 17:14:33 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev UNINITIALIZED)(curr ENABLED)(IDLE)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Because we are impatient and don't want to wait 3 minutes, let's wake up the
Expand All @@ -802,14 +802,14 @@ sleeping watchdog:
Forced watchdog scan.
[fndcatemp2] (Resilience@resilienceDomain) admin > pool ls rw-dmsdca24-2
rw-dmsdca24-2 (completed: 0 / 0 : ?%) – (updated: Thu Jun 16 17:17:19 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev ENABLED)(curr ENABLED)(RUNNING)
rw-dmsdca24-2 (completed: 0 / 0 : ?%) - (updated: Thu Jun 16 17:17:19 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev ENABLED)(curr ENABLED)(RUNNING)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Shortly thereafter, we can see it is doing some work:

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[fndcatemp2] (Resilience@resilienceDomain) admin > pool ls rw-dmsdca24-2
rw-dmsdca24-2 (completed: 491 / ? : ?%) – (updated: Thu Jun 16 17:17:19 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev ENABLED)(curr ENABLED)(RUNNING)
rw-dmsdca24-2 (completed: 491 / ? : ?%) - (updated: Thu Jun 16 17:17:19 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev ENABLED)(curr ENABLED)(RUNNING)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Because this is a demo pool, there aren't many files, so the scan completes
Expand All @@ -822,8 +822,8 @@ other two "rw-" pools still appear:

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[fndcatemp2] (Resilience@resilienceDomain) admin > pool ls rw-
rw-dmsdca24-3 (completed: 0 / 0 : ?%) – (updated: Thu Jun 16 17:14:33 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev UNINITIALIZED)(curr ENABLED)(IDLE)
rw-dmsdca24-4 (completed: 0 / 0 : ?%) – (updated: Thu Jun 16 17:14:33 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev UNINITIALIZED)(curr ENABLED)(IDLE)
rw-dmsdca24-3 (completed: 0 / 0 : ?%) - (updated: Thu Jun 16 17:14:33 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev UNINITIALIZED)(curr ENABLED)(IDLE)
rw-dmsdca24-4 (completed: 0 / 0 : ?%) - (updated: Thu Jun 16 17:14:33 CDT 2016)(scanned: Thu Jun 16 17:14:33 CDT 2016)(prev UNINITIALIZED)(curr ENABLED)(IDLE)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Now, just to spot check that everything is right with the world, let's examine
Expand Down
4 changes: 2 additions & 2 deletions docs/TheBook/src/main/markdown/config-xrootd.md
View file
Expand Up @@ -456,9 +456,9 @@ See above (under ZTN) for an example layout configuration.
Note that the above configuration enforces TLS (STRICT); this is highly recommended
with SciToken authorization as the token hash is not secure unless encrypted.
While it is not strictly required to start TLS at login (since the actual token
is not passed until a request involving a path, in this case, 'open') ––
is not passed until a request involving a path, in this case, 'open') --
``xrootd.security.tls.require-session=true``
would have been sufficient –– the extra protection on login of course will not
would have been sufficient -- the extra protection on login of course will not
hurt. (The same applies to GSI: TLS is of course redundant for the handshake, but can further
guarantee data protection and integrity if on thereafter. For GSI-only doors, then, one can also
opt to start the TLS session after login using 'session'.)
Expand Down
2 changes: 1 addition & 1 deletion docs/TheBook/src/main/markdown/quota.md
View file
@@ -1,7 +1,7 @@
User and Group quota in dCache
==============================

Release 7.2 introduces a user and group quota implementation. The quota system operates on the chimera namespace. It periodically counts space usage broken down by Retention Policy, UID and GID, and stores these counts in two chimera DB tables –– t_user_quota and t_group_quota. Besides space counts these tables hold quota limits for each space count category by UID and by GID. A null for a limit means "no quota". No entries in these tables for a UID or GIDs means "no quota" for that UID or GID. CUSTODIAL Retention Policy corresponds to files going to tape, REPLICA corresponds to disk-only files, and OUTPUT currently is not used in dCache. The quota system is controlled by the master switch:
Release 7.2 introduces a user and group quota implementation. The quota system operates on the chimera namespace. It periodically counts space usage broken down by Retention Policy, UID and GID, and stores these counts in two chimera DB tables -- t_user_quota and t_group_quota. Besides space counts these tables hold quota limits for each space count category by UID and by GID. A null for a limit means "no quota". No entries in these tables for a UID or GIDs means "no quota" for that UID or GID. CUSTODIAL Retention Policy corresponds to files going to tape, REPLICA corresponds to disk-only files, and OUTPUT currently is not used in dCache. The quota system is controlled by the master switch:

```
dcache.enable.quota
Expand Down
2 changes: 1 addition & 1 deletion modules/dcache-bulk/src/main/java/org/dcache/services/bulk/BulkServiceCommands.java
View file
Expand Up @@ -146,7 +146,7 @@ public final class BulkServiceCommands implements CellCommandListener {
/**
* error type | error message
*/
private static final String FORMAT_TARGET_INFO_ERROR = " –– (ERROR: %s : %s)";
private static final String FORMAT_TARGET_INFO_ERROR = " -- (ERROR: %s : %s)";

/**
* id | arrived | modified | owner | status | uid
Expand Down
6 changes: 3 additions & 3 deletions modules/dcache-qos/src/main/java/org/dcache/qos/services/scanner/data/PoolOperationMap.java
View file
Expand Up @@ -831,21 +831,21 @@ private boolean doScan(String pool,
}

if (operation.currStatus == PoolQoSStatus.UNINITIALIZED) {
LOGGER.info("Cannot scan {} –– uninitialized", pool);
LOGGER.info("Cannot scan {} -- uninitialized", pool);
reset(pool, operation);
return false;
}

if (operation.state == State.EXCLUDED) {
LOGGER.info("Skipping scan {} –– pool is excluded", pool);
LOGGER.info("Skipping scan {} -- pool is excluded", pool);
reset(pool, operation);
return false;
}

if (!bypassStateCheck) {
if (operation.currStatus == PoolQoSStatus.DOWN &&
operation.lastStatus == PoolQoSStatus.DOWN) {
LOGGER.info("Skipping scan {} –– pool is down and was already "
LOGGER.info("Skipping scan {} -- pool is down and was already "
+ "scanned", pool);
reset(pool, operation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion modules/dcache-qos/src/main/java/org/dcache/qos/services/scanner/data/PoolScanOperation.java
View file
Expand Up @@ -78,7 +78,7 @@ public final class PoolScanOperation extends ScanOperation<PoolScanTask> {

private static final Logger LOGGER = LoggerFactory.getLogger(PoolScanOperation.class);

private static final String TO_STRING = "(completed: %s / %s : %s%%) – "
private static final String TO_STRING = "(completed: %s / %s : %s%%) - "
+ "(updated: %s)(%s: %s)(prev %s)(curr %s)(%s) %s";

enum State {
Expand Down
2 changes: 1 addition & 1 deletion modules/dcache-qos/src/main/java/org/dcache/qos/services/verifier/data/PoolInformation.java
View file
Expand Up @@ -67,7 +67,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
import org.dcache.qos.data.PoolQoSStatus;

/**
* Encapsulates "live" pool information – pool mode, status, and cost. Also stores pool tags.
* Encapsulates "live" pool information - pool mode, status, and cost. Also stores pool tags.
* <p/>
* This object is held by the {@link PoolInfoMap}; status, mode, tags and cost are refreshed during
* the Pool Monitor updates.
Expand Down
2 changes: 1 addition & 1 deletion ...he-qos/src/main/java/org/dcache/qos/services/verifier/util/AbstractLocationExtractor.java
View file
Expand Up @@ -121,7 +121,7 @@ public void reset() {

/**
* @param location to examine
* @return the number of tags whose values match values already stored in the seenTags map ––
* @return the number of tags whose values match values already stored in the seenTags map --
* that is, of locations/pools which either already exist or have been selected.
*/
private int checkPartitionConstraints(String location) {
Expand Down
2 changes: 1 addition & 1 deletion modules/dcache-qos/src/main/java/org/dcache/qos/util/MessageGuard.java
View file
Expand Up @@ -109,7 +109,7 @@ public Status getStatus(String message, Object messageObject) {
messageObject, enabled);

String session = CDC.getSession();
LOGGER.trace("{} – session {}", message, session);
LOGGER.trace("{} - session {}", message, session);

synchronized (backlogHandler) {
if (!enabled) {
Expand Down
2 changes: 1 addition & 1 deletion modules/dcache-resilience/src/main/java/org/dcache/resilience/data/PoolInformation.java
View file
Expand Up @@ -66,7 +66,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
import java.util.Map;

/**
* <p>Encapsulates "live" pool information – pool mode, status, and cost.
* <p>Encapsulates "live" pool information - pool mode, status, and cost.
* Also stores pool tags.</p>
*
* <p>This object is held by the {@link PoolInfoMap}; status, mode, tags
Expand Down
2 changes: 1 addition & 1 deletion modules/dcache-resilience/src/main/java/org/dcache/resilience/data/PoolOperation.java
View file
Expand Up @@ -72,7 +72,7 @@ public final class PoolOperation {

private static final Logger LOGGER = LoggerFactory.getLogger(PoolOperation.class);

private static final String TO_STRING = "(completed: %s / %s : %s%%) – "
private static final String TO_STRING = "(completed: %s / %s : %s%%) - "
+ "(updated: %s)(scanned: %s)(prev %s)(curr %s)(%s) %s";

enum State {
Expand Down
6 changes: 3 additions & 3 deletions modules/dcache-resilience/src/main/java/org/dcache/resilience/data/PoolOperationMap.java
View file
Expand Up @@ -802,21 +802,21 @@ private boolean doScan(PoolStateUpdate update, boolean bypassStateCheck) {
}

if (operation.currStatus == PoolStatusForResilience.UNINITIALIZED) {
LOGGER.info("Cannot scan {} –– uninitialized", update.pool);
LOGGER.info("Cannot scan {} -- uninitialized", update.pool);
reset(update.pool, operation);
return false;
}

if (operation.state == State.EXCLUDED) {
LOGGER.info("Skipping scan {} –– pool is excluded", update.pool);
LOGGER.info("Skipping scan {} -- pool is excluded", update.pool);
reset(update.pool, operation);
return false;
}

if (!bypassStateCheck) {
if (operation.currStatus == PoolStatusForResilience.DOWN &&
operation.lastStatus == PoolStatusForResilience.DOWN) {
LOGGER.info("Skipping scan {} –– pool is down and was already "
LOGGER.info("Skipping scan {} -- pool is down and was already "
+ "scanned", update.pool);
reset(update.pool, operation);
return false;
Expand Down
2 changes: 1 addition & 1 deletion ...dcache-resilience/src/main/java/org/dcache/resilience/util/AbstractLocationExtractor.java
View file
Expand Up @@ -124,7 +124,7 @@ public void reset() {

/**
* @param location to examine
* @return the number of tags whose values match values already stored in the seenTags map ––
* @return the number of tags whose values match values already stored in the seenTags map --
* that is, of locations/pools which either already exist or have been selected.
*/
private int checkPartitionConstraints(String location) {
Expand Down
2 changes: 1 addition & 1 deletion modules/dcache-resilience/src/main/java/org/dcache/resilience/util/MessageGuard.java
View file
Expand Up @@ -109,7 +109,7 @@ public Status getStatus(String message, Object messageObject) {
messageObject, enabled);

String session = CDC.getSession();
LOGGER.trace("{} – session {}", message, session);
LOGGER.trace("{} - session {}", message, session);

synchronized (backlogHandler) {
if (!enabled) {
Expand Down
2 changes: 1 addition & 1 deletion modules/dcache-vehicles/src/main/java/org/dcache/vehicles/CorruptFileMessage.java
View file
Expand Up @@ -86,7 +86,7 @@ public String getPool() {
}

public String toString() {
return String.format("%s: (pnfsid %s) (pool %s) – %s", getMessageName(),
return String.format("%s: (pnfsid %s) (pool %s) - %s", getMessageName(),
pnfsId, pool, super.toString());
}
}

0 comments on commit ad26320

Please sign in to comment.