Revert "dcache-qos: (1) Double -resilient flag with -primary on psu p…

…group"

This reverts commit fd92047.

modules/dcache/src/main/java/diskCacheV111/poolManager/DynamicPGroup.java

@@ -7,8 +7,8 @@ class DynamicPGroup extends PGroup {
     private static final long serialVersionUID = 3725185696861231668L;
     private final Map<String, String> tags;
 
-    DynamicPGroup(String name, boolean primary, Map<String, String> tags) {
-        super(name, primary);
+    DynamicPGroup(String name, boolean resilient, Map<String, String> tags) {
+        super(name, resilient);
         this.tags = tags;
     }
 

modules/dcache/src/main/java/diskCacheV111/poolManager/Link.java

@@ -40,7 +40,7 @@ public Collection<SelectionPoolGroup> getPoolGroupsPointingTo() {
             if (pcore instanceof PGroup) {
                 PGroup original = (PGroup)pcore;
                 PGroup newPGroup = new PGroup(original.getName(),
-                                              original.isPrimary());
+                                              original.isResilient());
                 pGroups.add(newPGroup);
             }
         }

modules/dcache/src/main/java/diskCacheV111/poolManager/PoolSelectionUnit.java

@@ -186,7 +186,6 @@ interface SelectionPool extends SelectionEntity
     }
 
     interface SelectionPoolGroup extends SelectionEntity {
-        boolean isPrimary();
         boolean isResilient();
     }
 

modules/dcache/src/main/java/diskCacheV111/poolManager/PoolSelectionUnitV2.java

@@ -292,7 +292,7 @@ public void printSetup(PrintWriter pw)
             _pGroups.values().stream().sorted(comparing(PGroup::getName)).forEachOrdered(
                     group -> {
                         pw.append("psu create pgroup ").append(group.getName());
-                        if (group.isPrimary()) {
+                        if (group.isResilient()) {
                             pw.append(" -resilient");
                         }
 
@@ -1121,10 +1121,10 @@ public String matchUnits(String netUnitName, ImmutableList<String> units) {
     // the create's
     //
 
-    public void createDynamicPoolGroup(String name, boolean isPrimary, Map<String, String> tags) {
+    public void createDynamicPoolGroup(String name, boolean isResilient, Map<String, String> tags) {
         wlock();
         try {
-            DynamicPGroup group = new DynamicPGroup(name, isPrimary, tags);
+            DynamicPGroup group = new DynamicPGroup(name, isResilient, tags);
 
             if (_pGroups.putIfAbsent(group.getName(), group) != null) {
                 throw new IllegalArgumentException("Duplicated entry : " + name);
@@ -1136,10 +1136,10 @@ public void createDynamicPoolGroup(String name, boolean isPrimary, Map<String, S
         }
     }
 
-    public void createPoolGroup(String name, boolean isPrimary) {
+    public void createPoolGroup(String name, boolean isResilient) {
             wlock();
         try {
-            PGroup group = new PGroup(name, isPrimary);
+            PGroup group = new PGroup(name, isResilient);
 
             if (_pGroups.putIfAbsent(group.getName(), group) != null) {
                 throw new IllegalArgumentException("Duplicated entry : " + name);
@@ -1419,7 +1419,7 @@ public Object listPoolGroupXml(String groupName) {
                 result[0] = groupName;
                 result[1] = group._poolList.keySet().toArray();
                 result[2] = group._linkList.keySet().toArray();
-                result[3] = group.isPrimary();
+                result[3] = group.isResilient();
                 xlsResult = result;
             }
         } finally {
@@ -1672,7 +1672,7 @@ public String listPoolGroups(boolean more, boolean detail, ImmutableList<String>
                 sb.append(group.getName()).append("\n");
                 if (detail) {
                     sb.append(" dynamic   = ").append(group instanceof DynamicPGroup).append("\n")
-                                    .append(" resilient = ").append(group.isPrimary())
+                                    .append(" resilient = ").append(group.isResilient())
                                     .append("\n")
                                     .append(" linkList :\n");
                     group._linkList.values().stream().sorted(comparing(Link::getName)).forEachOrdered(
@@ -2585,21 +2585,21 @@ public String ac_psu_clear_im_really_sure(Args args)
         return "";
     }
 
-    public static final String hh_psu_create_pgroup = "<pool group> [-resilient (deprecated) || -primary]";
+    public static final String hh_psu_create_pgroup = "<pool group> [-resilient]";
 
     @AffectsSetup
     public String ac_psu_create_pgroup_$_1(Args args)
     {
-        boolean primary = args.hasOption("resilient") || args.hasOption("primary");
         if (args.hasOption("dynamic")) {
             Map<String, String> tags = Splitter.on(',')
                     .omitEmptyStrings()
                     .trimResults()
                     .withKeyValueSeparator('=')
                     .split(args.getOption("tags", ""));
-            createDynamicPoolGroup(args.argv(0), primary, tags);
+
+            createDynamicPoolGroup(args.argv(0), args.hasOption("resilient"), tags);
         } else {
-            createPoolGroup(args.argv(0), primary);
+            createPoolGroup(args.argv(0), args.hasOption("resilient"));
         }
         return "";
     }

modules/dcache/src/main/java/diskCacheV111/poolManager/StorageUnitInfoExtractor.java

@@ -74,32 +74,25 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 public final class StorageUnitInfoExtractor
 {
     /**
-     * For backward compatibility.
-     */
-    public static Collection<String> getResilientGroupsFor(String unitName,
-                                                           PoolSelectionUnit psu) {
-        return getPrimaryGroupsFor(unitName, psu);
-    }
-
-    /**
-     * @param primaryOnly return only primary groups.
+     * @param resilientOnly return only resilient groups.
      * @return all the pool groups to which this storage unit is linked.
      */
     public static Collection<String> getPoolGroupsFor(String unitName,
                                                       PoolSelectionUnit psu,
-                                                      boolean primaryOnly)
+                                                      boolean resilientOnly)
     {
         return psu.getPoolGroups().values().stream()
-                  .filter((g) -> (primaryOnly ? g.isPrimary() : true) &&
+                  .filter((g) -> (resilientOnly ? g.isResilient() : true) &&
                                   hasStorageUnit(g.getName(), unitName, psu))
                   .map(SelectionPoolGroup::getName)
                   .collect(Collectors.toList());
     }
 
     /**
-     * @return all the primary pool groups to which this storage unit is linked.
+     * @return all the resilient pool groups to which this storage unit is linked.
      */
-    public static Collection<String> getPrimaryGroupsFor(String unitName, PoolSelectionUnit psu)
+    public static Collection<String> getResilientGroupsFor(String unitName,
+                                                           PoolSelectionUnit psu)
     {
         return getPoolGroupsFor(unitName, psu, true);
     }
@@ -122,18 +115,12 @@ public static Collection<StorageUnit> getStorageUnitsInGroup(String name,
         return units;
     }
 
-    /**
-     * For backward compatibility.
-     */
-    public static boolean hasResilientStorageUnit(String poolGroup, PoolSelectionUnit psu) {
-        return hasPrimaryStorageUnit(poolGroup, psu);
-    }
-
     /**
      * @return true if the pool group has at least one storage group
-     * associated with it via a link, and the storage group is primary.
+     * associated with it via a link, and the storage group is resilient.
      */
-    public static boolean hasPrimaryStorageUnit(String poolGroup, PoolSelectionUnit psu)
+    public static boolean hasResilientStorageUnit(String poolGroup,
+                                                  PoolSelectionUnit psu)
     {
         return getStorageUnitsInGroup(poolGroup, psu)
                         .stream()