Merge pull request #1 from apache/master

Update Fork

Author: DK101010

PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,7 @@
-## Description
-<!--- Describe your changes in detail -->
+### Description
+
+This PR...
+<!--- Describe your changes in DETAIL - And how has behaviour functionally changed. -->
 
 <!-- For new features, provide link to FS, dev ML discussion etc. -->
 <!-- In case of bug fix, the expected and actual behaviours, steps to reproduce. -->
@@ -8,17 +10,39 @@
 <!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" -->
 <!-- Fixes: # -->
 
-## Types of changes
-<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+<!--- ********************************************************************************* -->
+<!--- NOTE: AUTOMATATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE DOCUMENTATION. -->
+<!--- PLEASE PUT AN 'X' in only **ONE** box -->
+<!--- ********************************************************************************* -->
+
+### Types of changes
+
 - [ ] Breaking change (fix or feature that would cause existing functionality to change)
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Bug fix (non-breaking change which fixes an issue)
 - [ ] Enhancement (improves an existing feature and functionality)
 - [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
 
-## Screenshots (if appropriate):
+### Feature/Enhancement Scale or Bug Severity
+
+#### Feature/Enhancement Scale
+
+- [ ] Major
+- [ ] Minor
+
+#### Bug Severity
+
+- [ ] BLOCKER
+- [ ] Critical
+- [ ] Major
+- [ ] Minor
+- [ ] Trivial
+
+
+### Screenshots (if appropriate):
+
 
-## How Has This Been Tested?
+### How Has This Been Tested?
 <!-- Please describe in detail how you tested your changes. -->
 <!-- Include details of your testing environment, and the tests you ran to -->
 <!-- see how your change affects other areas of the code, etc. -->

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

@@ -420,6 +420,19 @@ protected void cancelTasks() {
         }
     }
 
+    /**
+     * Cleanup agent zone properties.
+     *
+     * Unset zone, cluster and pod values so that host is not added back
+     * when service is restarted. This will be set to proper values
+     * when host is added back
+     */
+    protected void cleanupAgentZoneProperties() {
+        _shell.setPersistentProperty(null, "zone", "");
+        _shell.setPersistentProperty(null, "cluster", "");
+        _shell.setPersistentProperty(null, "pod", "");
+    }
+
     public synchronized void lockStartupTask(final Link link) {
         _startup = new StartupTask(link);
         _timer.schedule(_startup, _startupWait);
@@ -603,6 +616,9 @@ protected void processRequest(final Request request, final Link link) {
                         final ShutdownCommand shutdown = (ShutdownCommand)cmd;
                         s_logger.debug("Received shutdownCommand, due to: " + shutdown.getReason());
                         cancelTasks();
+                        if (shutdown.isRemoveHost()) {
+                            cleanupAgentZoneProperties();
+                        }
                         _reconnectAllowed = false;
                         answer = new Answer(cmd, true, null);
                     } else if (cmd instanceof ReadyCommand && ((ReadyCommand)cmd).getDetails() != null) {

api/src/main/java/com/cloud/agent/api/StoragePoolInfo.java

@@ -28,6 +28,7 @@ public class StoragePoolInfo {
     StoragePoolType poolType;
     long capacityBytes;
     long availableBytes;
+    String name;
     Map<String, String> details;
 
     protected StoragePoolInfo() {
@@ -67,14 +68,34 @@ public String getHost() {
         return host;
     }
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setLocalPath(String localPath) {
+        this.localPath = localPath;
+    }
+
     public String getLocalPath() {
         return localPath;
     }
 
+    public void setHostPath(String hostPath) {
+        this.hostPath = hostPath;
+    }
+
     public String getHostPath() {
         return hostPath;
     }
 
+    public void setPoolType(StoragePoolType poolType) {
+        this.poolType = poolType;
+    }
+
     public StoragePoolType getPoolType() {
         return poolType;
     }