Merge remote-tracking branch 'apache/4.20' into scalability-improvements-changes

Author: shwstppr

agent/src/main/java/com/cloud/agent/Agent.java

@@ -56,6 +56,7 @@
 import org.apache.cloudstack.utils.security.KeyStoreUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -135,6 +136,8 @@ public int value() {
     ServerResource serverResource;
     Link link;
     Long id;
+    String _uuid;
+    String _name;
 
     ScheduledExecutorService selfTaskExecutor;
     ScheduledExecutorService certExecutor;
@@ -219,9 +222,12 @@ public Agent(final IAgentShell shell, final int localAgentId, final ServerResour
         serverResource = resource;
         link = null;
         resource.setAgentControl(this);
-        final String value = this.shell.getPersistentProperty(getResourceName(), "id");
+        final String value = shell.getPersistentProperty(getResourceName(), "id");
+        _uuid = shell.getPersistentProperty(getResourceName(), "uuid");
+        _name = shell.getPersistentProperty(getResourceName(), "name");
         id = value != null ? Long.parseLong(value) : null;
-        logger.info("id is {}", (id != null ? id : ""));
+        logger.info("Initialising agent [id: {}, uuid: {}, name: {}]", ObjectUtils.defaultIfNull(id, ""), _uuid, _name);
+
         final Map<String, Object> params = new HashMap<>();
         // merge with properties from command line to let resource access command line parameters
         for (final Map.Entry<String, Object> cmdLineProp : this.shell.getCmdLineProperties().entrySet()) {
@@ -238,15 +244,17 @@ public Agent(final IAgentShell shell, final int localAgentId, final ServerResour
         logger.info("{} with host = {}, local id = {}", this, host, localAgentId);
     }
 
+
     @Override
     public String toString() {
-        return String.format("Agent [id = %s, type = %s, zone = %s, pod = %s, workers = %d, host = %s, port = %d]",
-                (id != null ? String.valueOf(id) : "new"),
+        return String.format("Agent [id = %s, uuid = %s, name = %s, type = %s, zone = %s, pod = %s, workers = %d, port = %d]",
+                ObjectUtils.defaultIfNull(id, "new"),
+                _uuid,
+                _name,
                 getResourceName(),
                 this.shell.getZone(),
                 this.shell.getPod(),
                 this.shell.getWorkers(),
-                this.shell.getNextHost(),
                 this.shell.getPort());
     }
 
@@ -406,6 +414,24 @@ public void setId(final Long id) {
         shell.setPersistentProperty(getResourceName(), "id", Long.toString(id));
     }
 
+    public String getUuid() {
+        return _uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this._uuid = uuid;
+        shell.setPersistentProperty(getResourceName(), "uuid", uuid);
+    }
+
+    public String getName() {
+        return _name;
+    }
+
+    public void setName(String name) {
+        this._name = name;
+        shell.setPersistentProperty(getResourceName(), "name", name);
+    }
+
     private void scheduleCertificateRenewalTask() {
         String name = "CertificateRenewalTask";
         if (certExecutor != null && !certExecutor.isShutdown()) {
@@ -655,17 +681,21 @@ public void processStartupAnswer(final Answer answer, final Response response, f
             return;
         }
 
-        logger.info("Process agent startup answer, agent id = {}", startup.getHostId());
+        logger.info("Process agent startup answer, agent [id: {}, uuid: {}, name: {}] connected to the server",
+                startup.getHostId(), startup.getHostUuid(), startup.getHostName());
 
         setId(startup.getHostId());
+        setUuid(startup.getHostUuid());
+        setName(startup.getHostName());
         pingInterval = startup.getPingInterval() * 1000L; // change to ms.
 
         updateLastPingResponseTime();
         scheduleWatch(link, response, pingInterval, pingInterval);
 
         outRequestHandler.setKeepAliveTime(2 * pingInterval, TimeUnit.MILLISECONDS);
 
-        logger.info("Startup Response Received: agent id = {}", getId());
+        logger.info("Startup Response Received: agent [id: {}, uuid: {}, name: {}]",
+                startup.getHostId(), startup.getHostUuid(), startup.getHostName());
     }
 
     protected void processRequest(final Request request, final Link link) {
@@ -921,15 +951,17 @@ public void processReadyCommand(final Command cmd) {
             NumbersUtil.enableHumanReadableSizes = humanReadable;
         }
 
-        logger.info("Processing agent ready command, agent id = {}", ready.getHostId());
+        logger.info("Processing agent ready command, agent id = {}, uuid = {}, name = {}", ready.getHostId(), ready.getHostUuid(), ready.getHostName());
         if (ready.getHostId() != null) {
             setId(ready.getHostId());
+            setUuid(ready.getHostUuid());
+            setName(ready.getHostName());
         }
 
         verifyAgentArch(ready.getArch());
         processManagementServerList(ready.getMsHostList(), ready.getLbAlgorithm(), ready.getLbCheckInterval());
 
-        logger.info("Ready command is processed for agent id = {}", getId());
+        logger.info("Ready command is processed for agent [id: {}, uuid: {}, name: {}]", getId(), getUuid(), getName());
     }
 
     private void verifyAgentArch(String arch) {

api/src/main/java/com/cloud/agent/api/to/LoadBalancerTO.java

@@ -374,13 +374,15 @@ public String getMonitorState() {
     public static class CounterTO implements Serializable {
         private static final long serialVersionUID = 2L;
         private final Long id;
+        private final String uuid;
         private final String name;
         private final Counter.Source source;
         private final String value;
         private final String provider;
 
-        public CounterTO(Long id, String name, Counter.Source source, String value, String provider) {
+        public CounterTO(Long id, String uuid, String name, Counter.Source source, String value, String provider) {
             this.id = id;
+            this.uuid = uuid;
             this.name = name;
             this.source = source;
             this.value = value;
@@ -391,6 +393,10 @@ public Long getId() {
             return id;
         }
 
+        public String getUuid() {
+            return uuid;
+        }
+
         public String getName() {
             return name;
         }
@@ -411,12 +417,14 @@ public String getProvider() {
     public static class ConditionTO implements Serializable {
         private static final long serialVersionUID = 2L;
         private final Long id;
+        private final String uuid;
         private final long threshold;
         private final Condition.Operator relationalOperator;
         private final CounterTO counter;
 
-        public ConditionTO(Long id, long threshold, Condition.Operator relationalOperator, CounterTO counter) {
+        public ConditionTO(Long id, String uuid, long threshold, Condition.Operator relationalOperator, CounterTO counter) {
             this.id = id;
+            this.uuid = uuid;
             this.threshold = threshold;
             this.relationalOperator = relationalOperator;
             this.counter = counter;
@@ -426,6 +434,10 @@ public Long getId() {
             return id;
         }
 
+        public String getUuid() {
+            return uuid;
+        }
+
         public long getThreshold() {
             return threshold;
         }
@@ -442,15 +454,17 @@ public CounterTO getCounter() {
     public static class AutoScalePolicyTO implements Serializable {
         private static final long serialVersionUID = 2L;
         private final long id;
+        private final String uuid;
         private final int duration;
         private final int quietTime;
         private final Date lastQuietTime;
         private AutoScalePolicy.Action action;
         boolean revoked;
         private final List<ConditionTO> conditions;
 
-        public AutoScalePolicyTO(long id, int duration, int quietTime, Date lastQuietTime, AutoScalePolicy.Action action, List<ConditionTO> conditions, boolean revoked) {
+        public AutoScalePolicyTO(long id, String uuid, int duration, int quietTime, Date lastQuietTime, AutoScalePolicy.Action action, List<ConditionTO> conditions, boolean revoked) {
             this.id = id;
+            this.uuid = uuid;
             this.duration = duration;
             this.quietTime = quietTime;
             this.lastQuietTime = lastQuietTime;
@@ -463,6 +477,10 @@ public long getId() {
             return id;
         }
 
+        public String getUuid() {
+            return uuid;
+        }
+
         public int getDuration() {
             return duration;
         }

api/src/main/java/com/cloud/agent/api/to/NfsTO.java

@@ -17,6 +17,7 @@
 package com.cloud.agent.api.to;
 
 import com.cloud.storage.DataStoreRole;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 public class NfsTO implements DataStoreTO {
 
@@ -41,6 +42,13 @@ public NfsTO(String url, DataStoreRole role) {
 
     }
 
+    @Override
+    public String toString() {
+        return String.format("NfsTO %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "uuid", "_url", "_role", "nfsVersion"));
+    }
+
     @Override
     public String getUrl() {
         return _url;

api/src/main/java/com/cloud/agent/api/to/S3TO.java

@@ -22,6 +22,7 @@
 import com.cloud.agent.api.LogLevel.Log4jLevel;
 import com.cloud.storage.DataStoreRole;
 import com.cloud.utils.storage.S3.ClientOptions;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 public final class S3TO implements ClientOptions, DataStoreTO {
 
@@ -68,6 +69,13 @@ public S3TO(final Long id, final String uuid, final String accessKey, final Stri
 
     }
 
+    @Override
+    public String toString() {
+        return String.format("S3TO %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "uuid", "bucketName"));
+    }
+
     public Long getId() {
         return this.id;
     }

api/src/main/java/com/cloud/agent/api/to/StorageFilerTO.java

@@ -19,6 +19,7 @@
 import com.cloud.agent.api.LogLevel;
 import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.storage.StoragePool;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 public class StorageFilerTO {
     long id;
@@ -73,6 +74,6 @@ protected StorageFilerTO() {
 
     @Override
     public String toString() {
-        return new StringBuilder("Pool[").append(id).append("|").append(host).append(":").append(port).append("|").append(path).append("]").toString();
+        return String.format("Pool %s", ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "id", "uuid", "host", "port", "path"));
     }
 }

api/src/main/java/com/cloud/agent/api/to/SwiftTO.java

@@ -18,6 +18,7 @@
 
 import com.cloud.storage.DataStoreRole;
 import com.cloud.utils.SwiftUtil;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 public class SwiftTO implements DataStoreTO, SwiftUtil.SwiftClientCfg {
     Long id;
@@ -41,6 +42,13 @@ public SwiftTO(Long id, String url, String account, String userName, String key,
         this.storagePolicy = storagePolicy;
     }
 
+    @Override
+    public String toString() {
+        return String.format("SwiftTO %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "account", "userName"));
+    }
+
     public Long getId() {
         return id;
     }

api/src/main/java/com/cloud/network/Ipv6Service.java

@@ -58,7 +58,7 @@ public interface Ipv6Service extends PluggableService, Configurable {
 
     Pair<Integer, Integer> getUsedTotalIpv6SubnetForZone(long zoneId);
 
-    Pair<String, String> preAllocateIpv6SubnetForNetwork(long zoneId) throws ResourceAllocationException;
+    Pair<String, String> preAllocateIpv6SubnetForNetwork(DataCenter zone) throws ResourceAllocationException;
 
     void assignIpv6SubnetToNetwork(String subnet, long networkId);
 

api/src/main/java/com/cloud/network/NetworkProfile.java

@@ -22,6 +22,7 @@
 import com.cloud.network.Networks.BroadcastDomainType;
 import com.cloud.network.Networks.Mode;
 import com.cloud.network.Networks.TrafficType;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 public class NetworkProfile implements Network {
     private final long id;
@@ -384,4 +385,11 @@ public Integer getNetworkCidrSize() {
         return networkCidrSize;
     }
 
+    @Override
+    public String toString() {
+        return String.format("NetworkProfile %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "uuid", "name", "networkOfferingId"));
+    }
+
 }

api/src/main/java/com/cloud/network/lb/LoadBalancingRule.java

@@ -63,6 +63,10 @@ public long getId() {
         return lb.getId();
     }
 
+    public LoadBalancer getLb() {
+        return lb;
+    }
+
     public String getName() {
         return lb.getName();
     }

api/src/main/java/com/cloud/network/vpn/RemoteAccessVpnService.java

@@ -39,7 +39,7 @@ public interface RemoteAccessVpnService {
 
     VpnUser addVpnUser(long vpnOwnerId, String userName, String password);
 
-    boolean removeVpnUser(long vpnOwnerId, String userName, Account caller);
+    boolean removeVpnUser(Account vpnOwner, String userName, Account caller);
 
     List<? extends VpnUser> listVpnUsers(long vpnOwnerId, String userName);