remove code in comments

Author: Daan Hoogland

engine/components-api/src/main/java/com/cloud/vm/VmWorkSerializer.java

@@ -61,14 +61,12 @@ public static String serialize(VmWork work) {
         // use java binary serialization instead
         //
         return JobSerializerHelper.toObjectSerializedString(work);
-        // return s_gson.toJson(work);
     }
 
     public static <T extends VmWork> T deserialize(Class<?> clazz, String workInJsonText) {
         // TODO: there are way many generics, too tedious to get serialization work under GSON
         // use java binary serialization instead
         //
         return (T)JobSerializerHelper.fromObjectSerializedString(workInJsonText);
-        // return (T)s_gson.fromJson(workInJsonText, clazz);
     }
 }

engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java

@@ -1627,7 +1627,6 @@ protected void processRequest(final Link link, final Request request) {
                         final String reason = shutdown.getReason();
                         logger.info("Host {} has informed us that it is shutting down with reason {} and detail {}", attache, reason, shutdown.getDetail());
                         if (reason.equals(ShutdownCommand.Update)) {
-                            // disconnectWithoutInvestigation(attache, Event.UpdateNeeded);
                             throw new CloudRuntimeException("Agent update not implemented");
                         } else if (reason.equals(ShutdownCommand.Requested)) {
                             disconnectWithoutInvestigation(attache, Event.ShutdownRequested);

engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java

@@ -962,7 +962,6 @@ protected void runInContext() {
                     synchronized (_agentToTransferIds) {
                         if (!_agentToTransferIds.isEmpty()) {
                             logger.debug("Found {} agents to transfer", _agentToTransferIds.size());
-                            // for (Long hostId : _agentToTransferIds) {
                             for (final Iterator<Long> iterator = _agentToTransferIds.iterator(); iterator.hasNext(); ) {
                                 final Long hostId = iterator.next();
                                 final AgentAttache attache = findAttache(hostId);

engine/schema/src/main/java/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java

@@ -81,8 +81,6 @@ public boolean remove(Long id) {
         TransactionLegacy txn = TransactionLegacy.currentTxn();
         txn.start();
         ClusterVSMMapVO cluster = createForUpdate();
-        //cluster.setClusterId(null);
-        //cluster.setVsmId(null);
 
         update(id, cluster);
 

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2214to30.java

@@ -77,8 +77,6 @@ public void performDataMigration(Connection conn) {
         encryptData(conn);
         // drop keys
         dropKeysIfExist(conn);
-        //update template ID for system Vms
-        //updateSystemVms(conn); This is not required as system template update is handled during 4.2 upgrade
         // update domain network ref
         updateDomainNetworkRef(conn);
         // update networks that use redundant routers to the new network offering

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade302to40.java

@@ -62,7 +62,6 @@ public InputStream[] getPrepareScripts() {
 
     @Override
     public void performDataMigration(Connection conn) {
-        //updateVmWareSystemVms(conn); This is not required as system template update is handled during 4.2 upgrade
         correctVRProviders(conn);
         correctMultiplePhysicaNetworkSetups(conn);
         addHostDetailsUniqueKey(conn);

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade304to305.java

@@ -65,7 +65,6 @@ public void performDataMigration(Connection conn) {
         addVpcProvider(conn);
         updateRouterNetworkRef(conn);
         fixZoneUsingExternalDevices(conn);
-//        updateSystemVms(conn);
         fixForeignKeys(conn);
         encryptClusterDetails(conn);
     }
@@ -81,54 +80,6 @@ public InputStream[] getCleanupScripts() {
         return new InputStream[] {script};
     }
 
-    private void updateSystemVms(Connection conn) {
-        PreparedStatement pstmt = null;
-        ResultSet rs = null;
-        boolean VMware = false;
-        try {
-            pstmt = conn.prepareStatement("select distinct(hypervisor_type) from `cloud`.`cluster` where removed is null");
-            rs = pstmt.executeQuery();
-            while (rs.next()) {
-                if ("VMware".equals(rs.getString(1))) {
-                    VMware = true;
-                }
-            }
-        } catch (SQLException e) {
-            throw new CloudRuntimeException("Error while iterating through list of hypervisors in use", e);
-        }
-        // Just update the VMware system template. Other hypervisor templates are unchanged from previous 3.0.x versions.
-        logger.debug("Updating VMware System Vms");
-        try {
-            //Get 3.0.5 VMware system Vm template Id
-            pstmt = conn.prepareStatement("select id from `cloud`.`vm_template` where name = 'systemvm-vmware-3.0.5' and removed is null");
-            rs = pstmt.executeQuery();
-            if (rs.next()) {
-                long templateId = rs.getLong(1);
-                rs.close();
-                pstmt.close();
-                // change template type to SYSTEM
-                pstmt = conn.prepareStatement("update `cloud`.`vm_template` set type='SYSTEM' where id = ?");
-                pstmt.setLong(1, templateId);
-                pstmt.executeUpdate();
-                pstmt.close();
-                // update template ID of system Vms
-                pstmt = conn.prepareStatement("update `cloud`.`vm_instance` set vm_template_id = ? where type <> 'User' and hypervisor_type = 'VMware'");
-                pstmt.setLong(1, templateId);
-                pstmt.executeUpdate();
-                pstmt.close();
-            } else {
-                if (VMware) {
-                    throw new CloudRuntimeException("3.0.5 VMware SystemVm template not found. Cannot upgrade system Vms");
-                } else {
-                    logger.warn("3.0.5 VMware SystemVm template not found. VMware hypervisor is not used, so not failing upgrade");
-                }
-            }
-        } catch (SQLException e) {
-            throw new CloudRuntimeException("Error while updating VMware systemVm template", e);
-        }
-        logger.debug("Updating System Vm Template IDs Complete");
-    }
-
     private void addVpcProvider(Connection conn) {
         //Encrypt config params and change category to Hidden
         logger.debug("Adding vpc provider to all physical networks in the system");

scripts/installer/createtmplt.sh

@@ -270,9 +270,4 @@ echo "volume.size=$volsize" >> /$tmpltfs/template.properties
 zfs snapshot -r $tmpltfs@vmops_ss
 rollback_if_needed $tmpltfs $? "Failed to snapshot filesystem"
 
-#if [ "$cleanup" == "true" ]
-#then
-  #rm -f $tmpltimg
-#fi
-
 exit 0

scripts/installer/createvolume.sh

@@ -271,9 +271,4 @@ echo "volume.size=$volsize" >> /$volfs/volume.properties
 zfs snapshot -r $volfs@vmops_ss
 rollback_if_needed $volfs $? "Failed to snapshot filesystem"
 
-#if [ "$cleanup" == "true" ]
-#then
-  #rm -f $volimg
-#fi
-
 exit 0

scripts/storage/secondary/listvmtmplt.sh

@@ -53,11 +53,6 @@ for i in $(find /$rootdir -name template.properties );
 do
   d=$(dirname $i)
   filename=$(grep "^filename" $i | awk -F"=" '{print $NF}')
-#  size=$(grep "virtualsize" $i | awk -F"=" '{print $NF}')
-#  if [ -n "$filename" ] && [ -n "$size" ]
-#  then
-#    d=$d/$filename/$size
-#  fi
   echo ${d#/}/$filename #remove leading slash
 done