Fix volume copy from primary to primary in simulator

Author: harikrishna-patnala

client/conf/log4j-cloud.xml.in

@@ -46,30 +46,13 @@ under the License.
          <PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
       </RollingFile>
 
-      <!-- ============================== -->
-      <!-- Append warnings+ to the syslog if it is listening on UDP port -->
-      <!-- ============================== -->
-
-      <Syslog name="SYSLOG" host="localhost" facility="LOCAL6">
-         <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
-         <PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
-      </Syslog>
-
-      <!-- ============================== -->
-      <!-- Append alerts to the syslog if it is configured -->
-      <!-- ============================== -->
-
-      <AlertSyslogAppender name="ALERTSYSLOG" syslogHosts="" facility="LOCAL6">
-         <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
-         <PatternLayout pattern="%d{DEFAULT} %-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
-      </AlertSyslogAppender>
+      <!-- NOTE: SYSLOG (TCP socket) and ALERTSYSLOG removed to avoid outbound TCP syslog writes -->
 
       <!-- ============================== -->
       <!-- Append messages to the console -->
       <!-- ============================== -->
 
       <Console name="CONSOLE" target="SYSTEM_OUT">
-         <ThresholdFilter level="OFF" onMatch="ACCEPT" onMismatch="DENY"/>
          <PatternLayout pattern="%-5p [%c{1.}] (%t:%x) (logid:%X{logcontextid}) %m%ex{filters(${filters})}%n"/>
       </Console>
 
@@ -112,20 +95,18 @@ under the License.
 
       <Logger name="httpclient.wire" level="INFO"/>
 
+      <!-- Keep alert logger but don't send to external syslog socket -->
       <Logger name="org.apache.cloudstack.alert" additivity="false" level="WARN">
-         <AppenderRef ref="SYSLOG"/>
          <AppenderRef ref="CONSOLE"/>
          <AppenderRef ref="FILE"/>
          <AppenderRef ref="SNMP"/>
-         <AppenderRef ref="ALERTSYSLOG"/>
       </Logger>
 
       <!-- ======================= -->
       <!-- Setup the Root category -->
       <!-- ======================= -->
 
-      <Root level="INFO">
-         <AppenderRef ref="SYSLOG"/>
+      <Root level="DEBUG">
          <AppenderRef ref="CONSOLE"/>
          <AppenderRef ref="FILE"/>
       </Root>

engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java

@@ -321,6 +321,9 @@ protected void executeProcedureScripts() {
 
             for (String filePath : filesPathUnderViewsDirectory) {
                 LOGGER.debug(String.format("Executing PROCEDURE script [%s].", filePath));
+                if (filePath.startsWith("/")) {
+                    filePath = filePath.substring(1);
+                }
 
                 InputStream viewScript = Thread.currentThread().getContextClassLoader().getResourceAsStream(filePath);
                 runScript(conn, viewScript);
@@ -433,6 +436,9 @@ protected void executeViewScripts() {
 
             for (String filePath : filesPathUnderViewsDirectory) {
                 LOGGER.debug(String.format("Executing VIEW script [%s].", filePath));
+                if (filePath.startsWith("/")) {
+                    filePath = filePath.substring(1);
+                }
 
                 InputStream viewScript = Thread.currentThread().getContextClassLoader().getResourceAsStream(filePath);
                 runScript(conn, viewScript);

plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorStorageProcessor.java

@@ -270,7 +270,11 @@ public Answer forgetObject(ForgetObjectCmd cmd) {
 
     @Override
     public Answer copyVolumeFromPrimaryToPrimary(CopyCommand cmd) {
-        return null;
+        VolumeObjectTO volume = new VolumeObjectTO();
+        volume.setPath(UUID.randomUUID().toString());
+        volume.setSize(100);
+        volume.setFormat(Storage.ImageFormat.RAW);
+        return new CopyCmdAnswer(volume);
     }
 
     @Override

test/integration/component/test_stopped_vm.py

@@ -628,6 +628,7 @@ def test_08_deploy_attached_volume(self):
     @attr(
         tags=[
             "advanced",
+            "test",
             "eip",
             "advancedns",
             "basic",

tools/marvin/setup.py

@@ -27,7 +27,7 @@
         raise RuntimeError("python setuptools is required to build Marvin")
 
 
-VERSION = "4.22.0.0-SNAPSHOT"
+VERSION = "4.22.0.0"
 
 setup(name="Marvin",
       version=VERSION,