monir fixups

Author: vishesh92

server/src/main/java/com/cloud/storage/OCFS2ManagerImpl.java

@@ -88,12 +88,12 @@ public boolean stop() {
     private List<Ternary<Integer, String, String>> marshalNodes(List<HostVO> hosts) {
         Integer i = 0;
         List<Ternary<Integer, String, String>> lst = new ArrayList<Ternary<Integer, String, String>>();
-        for (HostVO h : hosts) {
+        for (HostVO host : hosts) {
             /**
              * Don't show "node" in node name otherwise OVM's utils/config_o2cb.sh will be going crazy
              */
-            String nodeName = "ovm_" + h.getPrivateIpAddress().replace(".", "_");
-            Ternary<Integer, String, String> node = new Ternary<Integer, String, String>(i, h.getPrivateIpAddress(), nodeName);
+            String nodeName = "ovm_" + host.getPrivateIpAddress().replace(".", "_");
+            Ternary<Integer, String, String> node = new Ternary<Integer, String, String>(i, host.getPrivateIpAddress(), nodeName);
             lst.add(node);
             i++;
         }
@@ -102,14 +102,14 @@ private List<Ternary<Integer, String, String>> marshalNodes(List<HostVO> hosts)
 
     private boolean prepareNodes(String clusterName, List<HostVO> hosts) {
         PrepareOCFS2NodesCommand cmd = new PrepareOCFS2NodesCommand(clusterName, marshalNodes(hosts));
-        for (HostVO h : hosts) {
-            Answer ans = _agentMgr.easySend(h.getId(), cmd);
+        for (HostVO host : hosts) {
+            Answer ans = _agentMgr.easySend(host.getId(), cmd);
             if (ans == null) {
-                logger.debug("Host {} is not in UP state, skip preparing OCFS2 node on it", h);
+                logger.debug("Host {} is not in UP state, skip preparing OCFS2 node on it", host);
                 continue;
             }
             if (!ans.getResult()) {
-                logger.warn("PrepareOCFS2NodesCommand failed on host {} {}", h, ans.getDetails());
+                logger.warn("PrepareOCFS2NodesCommand failed on host {} {}", host, ans.getDetails());
                 return false;
             }
         }

server/src/main/java/com/cloud/tags/TaggedResourceManagerImpl.java

@@ -167,9 +167,9 @@ protected void checkTagsDeletePermission(List<ResourceTag> tagsToDelete, Account
         for (ResourceTag resourceTag : tagsToDelete) {
             Account owner = _accountMgr.getAccount(resourceTag.getAccountId());
             if(logger.isDebugEnabled()) {
-                logger.debug("Resource Tag Id: {}, Resource Tag Uuid: {}, Resource Tag Type: {}, " +
-                        "Resource Tag Account: {}", resourceTag.getResourceId(),
-                        resourceTag.getResourceUuid(), resourceTag.getResourceType(), owner);
+                logger.debug("Resource Tag Id: {}, Uuid: {}, Type: {}, Account: {}",
+                        resourceTag.getResourceId(), resourceTag.getResourceUuid(),
+                        resourceTag.getResourceType(), owner);
             }
             if (caller.getAccountId() != resourceTag.getAccountId()) {
                 if(logger.isDebugEnabled()) {