Backport NPE fixes

.automation/build-rpm.sh

@@ -3,7 +3,7 @@
 source $(dirname "$(readlink -f "$0")")/build-srpm.sh
 
 # Install build dependencies
-dnf builddep -y rpmbuild/SRPMS/*src.rpm
+$([ "$EUID" -eq 0 ] || echo /usr/bin/sudo) dnf builddep -y rpmbuild/SRPMS/*src.rpm
 
 # Perform reasonable quick build with unit tests execution
 BUILD_UT=1
@@ -14,7 +14,7 @@ BUILD_LOCALES=0
 rpmbuild \
     -D "_topmdir rpmbuild" \
     -D "_rpmdir rpmbuild" \
-    ${RELEASE:+-D "release_suffix ${RELEASE}"} \
+    ${SUFFIX:+-D "release_suffix ${SUFFIX}"} \
     -D "ovirt_build_ut ${BUILD_UT}" \
     -D "ovirt_build_all_user_agents ${BUILD_ALL_USER_AGENTS}" \
     -D "ovirt_build_locales ${BUILD_LOCALES}" \

.automation/build-srpm.sh

@@ -1,22 +1,15 @@
 #!/bin/bash -xe
 
-# git hash of current commit should be passed as the 1st paraameter
-if [ "${GITHUB_SHA}" == "" ]; then
-  GIT_HASH=$(git rev-list HEAD | wc -l)
-else
-  GIT_HASH=$(git rev-parse --short $GITHUB_SHA)
-fi
+# Mark current directory as safe for git to be able to parse git hash
+git config --global --add safe.directory $(pwd)
+
+# git hash of current commit passed from GitHub or HEAD
+GIT_HASH=$(git rev-parse --short ${GITHUB_SHA:-HEAD})
+SUFFIX=$(grep -E "<version"  pom.xml | head -n1 | awk -F '[<>]' '/version/{print $3}' | grep -q -- -SNAPSHOT && echo .git${GIT_HASH} || :)
 
 # Directory, where build artifacts will be stored, should be passed as the 1st parameter
 ARTIFACTS_DIR=${1:-exported-artifacts}
 
-# Prepare the version string (with support for SNAPSHOT versioning)
-VERSION=$(mvn help:evaluate  -q -DforceStdout -Dexpression=project.version)
-VERSION=${VERSION/-SNAPSHOT/-0.${GIT_HASH}.$(date +%04Y%02m%02d%02H%02M)}
-IFS='-' read -ra VERSION <<< "$VERSION"
-RELEASE=${VERSION[1]-1}
-MILESTONE=master
-
 # GH RPM builds will be used only for OST so Firefox and Chrome are enough
 # GWT build memory needs to be limited
 EXTRA_BUILD_FLAGS=""
@@ -42,4 +35,5 @@ mv *.tar.gz rpmbuild/SOURCES
 # create the src.rpm
 rpmbuild \
     -D "_topdir rpmbuild" \
+    ${SUFFIX:+-D "release_suffix ${SUFFIX}"} \
     -ts rpmbuild/SOURCES/*.gz

.github/workflows/rhv-build.yaml

@@ -0,0 +1,21 @@
+name: RHV build
+on:
+  push:
+    branches: [ovirt-engine-4.5.3.z]
+
+jobs:
+  get-pr:
+    runs-on: ubuntu-latest
+    outputs:
+      pr_url: ${{ steps.pr_url.outputs.pr_url }}
+    steps:
+    - id: pr_url
+      run: |
+        echo "pr_url=$(curl -sS https://api.github.com/repos/oVirt/ovirt-engine/commits/${{github.event.after}}/pulls | jq -r .[0].url)" >> $GITHUB_OUTPUT
+
+  rhv-build-and-ost:
+    needs: get-pr
+    uses: oVirt/ovirt-system-tests/.github/workflows/ost.yaml@master
+    with:
+      comment: "/ost rhv-build rhel8"
+      pr_url: "${{ needs.get-pr.outputs.pr_url }}"

Makefile

@@ -78,8 +78,7 @@ OFFLINE_BUILD_MAVEN_SETTINGS=$(shell pwd)/build/offline-build-maven-settings.xml
 
 include version.mak
 # major, minor, seq
-ENGINE_VERSION:=$(shell cat pom.xml | head -n 20 | grep '<version>' | head -n 1 | sed -e 's/.*>\(.*\)<.*/\1/' -e 's/-SNAPSHOT//')
-PACKAGE_VERSION=$(ENGINE_VERSION)$(if $(MILESTONE),_$(MILESTONE))
+PACKAGE_VERSION=$(RPM_VERSION)$(if $(MILESTONE),_$(MILESTONE))
 DISPLAY_VERSION=$(PACKAGE_VERSION)
 
 DEV_BUILD_FLAGS:=-P brand-source-maps
@@ -172,7 +171,7 @@ BUILD_TARGET=install
 	-e "s|@SETUP_VAR@|$(PKG_STATE_DIR)|g" \
 	-e "s|@DEV_PYTHON_DIR@|$(DEV_PYTHON_DIR)|g" \
 	-e "s|@DEV_SETUP_ENV_DIR@|$(DEV_SETUP_ENV_DIR)|g" \
-	-e "s|@RPM_VERSION@|$(ENGINE_VERSION)|g" \
+	-e "s|@RPM_VERSION@|$(RPM_VERSION)|g" \
 	-e "s|@RPM_RELEASE@|$(RPM_RELEASE)|g" \
 	-e "s|@MILESTONE@|$(MILESTONE)|g" \
 	-e "s|@PACKAGE_NAME@|$(PACKAGE_NAME)|g" \

backend/manager/dependencies/common/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.ovirt.engine.core.manager</groupId>
     <artifactId>dependencies</artifactId>
-    <version>4.5.3.2-SNAPSHOT</version>
+    <version>4.5.3.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>common-dependencies</artifactId>
@@ -30,11 +30,6 @@
       <artifactId>java-client-kubevirt</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>commons-jxpath</groupId>
-      <artifactId>commons-jxpath</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
@@ -234,12 +229,6 @@
                 <moduleName>org.ovirt.java-client-kubevirt</moduleName>
               </module>
 
-              <module>
-                <groupId>commons-jxpath</groupId>
-                <artifactId>commons-jxpath</artifactId>
-                <moduleName>org.apache.commons.jxpath</moduleName>
-              </module>
-
               <module>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>

backend/manager/dependencies/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.ovirt.engine.core</groupId>
     <artifactId>manager</artifactId>
-    <version>4.5.3.2-SNAPSHOT</version>
+    <version>4.5.3.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>dependencies</artifactId>

backend/manager/dependencies/tools/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.ovirt.engine.core.manager</groupId>
     <artifactId>dependencies</artifactId>
-    <version>4.5.3.2-SNAPSHOT</version>
+    <version>4.5.3.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>tools-dependencies</artifactId>

backend/manager/extensions-tool/pom.xml

@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.ovirt.engine.core</groupId>
     <artifactId>manager</artifactId>
-    <version>4.5.3.2-SNAPSHOT</version>
+    <version>4.5.3.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>extensions-tool</artifactId>

backend/manager/logutils/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.ovirt.engine.core</groupId>
     <artifactId>manager</artifactId>
-    <version>4.5.3.2-SNAPSHOT</version>
+    <version>4.5.3.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>logutils</artifactId>

backend/manager/modules/aaa/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.ovirt.engine.core</groupId>
     <artifactId>manager-modules</artifactId>
-    <version>4.5.3.2-SNAPSHOT</version>
+    <version>4.5.3.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>aaa</artifactId>

backend/manager/modules/auth-plugin/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.ovirt.engine.core</groupId>
     <artifactId>manager-modules</artifactId>
-    <version>4.5.3.2-SNAPSHOT</version>
+    <version>4.5.3.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>auth-plugin</artifactId>

backend/manager/modules/bll/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.ovirt.engine.core</groupId>
     <artifactId>manager-modules</artifactId>
-    <version>4.5.3.2-SNAPSHOT</version>
+    <version>4.5.3.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>bll</artifactId>

backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmFromOvaQuery.java

@@ -41,8 +41,8 @@ protected VM parseOvf(String ovf) {
             vm = getVmInfoFromOvaFile();
         }
 
-        if (originOvirt && vm != null) {
-            vm.setOrigin(OriginType.OVIRT);
+        if (vm != null) {
+            vm.setOrigin(originOvirt ? OriginType.OVIRT : OriginType.VMWARE);
         }
 
         return vm;

backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ReduceImageCommand.java

@@ -269,8 +269,16 @@ protected Map<String, Pair<String, String>> getSharedLocks() {
     @Override
     public AuditLogType getAuditLogTypeValue() {
         addAuditLogCustomValues();
-        return getSucceeded() ?
-                AuditLogType.USER_REDUCE_DISK_FINISHED_SUCCESS : AuditLogType.USER_REDUCE_DISK_FINISHED_FAILURE;
+        switch (getActionState()) {
+        case EXECUTE:
+            return getSucceeded() ?
+                    AuditLogType.UNASSIGNED
+                    : AuditLogType.USER_REDUCE_DISK_FINISHED_FAILURE;
+        default:
+            return getSucceeded() ?
+                    AuditLogType.USER_REDUCE_DISK_FINISHED_SUCCESS
+                    : AuditLogType.USER_REDUCE_DISK_FINISHED_FAILURE;
+        }
     }
 
     private void addAuditLogCustomValues() {

backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java

@@ -526,6 +526,6 @@ public Guid createTask(Guid taskId,
 
     @Override
     public CommandCallback getCallback() {
-        return getParameters().isUseCinderCommandCallback() ? callbackProvider.get() : null;
+        return callbackProvider.get();
     }
 }

backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java

@@ -60,6 +60,7 @@
 import org.ovirt.engine.core.common.errors.EngineException;
 import org.ovirt.engine.core.common.errors.EngineMessage;
 import org.ovirt.engine.core.common.queries.GetUnregisteredDisksQueryParameters;
+import org.ovirt.engine.core.common.queries.QueryReturnValue;
 import org.ovirt.engine.core.common.queries.QueryType;
 import org.ovirt.engine.core.common.utils.Pair;
 import org.ovirt.engine.core.common.vdscommands.IrsBaseVDSCommandParameters;
@@ -431,16 +432,23 @@ protected List<DiskImage> getAllOVFDisks(Guid storageDomainId, Guid storagePoolI
             ovfDisks = new ArrayList<>();
 
             // Get all unregistered disks.
-            List<DiskImage> disksFromStorage = backend.runInternalQuery(QueryType.GetUnregisteredDisks,
+            QueryReturnValue queryReturnValue = backend.runInternalQuery(QueryType.GetUnregisteredDisks,
                     new GetUnregisteredDisksQueryParameters(storageDomainId,
-                            storagePoolId)).getReturnValue();
-            if (disksFromStorage == null) {
+                            storagePoolId));
+            StorageDomain sd = storageDomainDao.get(storageDomainId);
+            if (sd.getStorageDomainType() == StorageDomainType.Data && !queryReturnValue.getSucceeded()) {
                 log.error("An error occurred while fetching unregistered disks from Storage Domain id '{}'",
                         storageDomainId);
+                throw new RuntimeException("Failed to retrieve unregistered disks");
+            }
+
+            List<DiskImage> disksFromStorage = queryReturnValue.getReturnValue();
+            if (disksFromStorage == null) {
                 return ovfDisks;
             } else {
                 castDiskImagesToUnregisteredDisks(disksFromStorage, storageDomainId);
             }
+
             for (Disk disk : disksFromStorage) {
                 DiskImage ovfStoreDisk = (DiskImage) disk;
                 String diskDescription = ovfStoreDisk.getDescription();

backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/RemoveDiskCommand.java

@@ -12,10 +12,12 @@
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
+import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 
 import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.bll.CommandBase;
+import org.ovirt.engine.core.bll.ConcurrentChildCommandsExecutionCallback;
 import org.ovirt.engine.core.bll.DisableInPrepareMode;
 import org.ovirt.engine.core.bll.LockMessage;
 import org.ovirt.engine.core.bll.LockMessagesMatchUtil;
@@ -28,6 +30,7 @@
 import org.ovirt.engine.core.bll.storage.disk.image.DisksFilter;
 import org.ovirt.engine.core.bll.storage.disk.image.ImagesHandler;
 import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil;
+import org.ovirt.engine.core.bll.tasks.interfaces.CommandCallback;
 import org.ovirt.engine.core.bll.utils.PermissionSubject;
 import org.ovirt.engine.core.bll.validator.storage.DiskImagesValidator;
 import org.ovirt.engine.core.bll.validator.storage.DiskOperationsValidator;
@@ -117,6 +120,8 @@ public class RemoveDiskCommand<T extends RemoveDiskParameters> extends CommandBa
     private UnregisteredDisksDao unregisteredDisksDao;
     @Inject
     private CommandCoordinatorUtil commandCoordinatorUtil;
+    @Inject
+    private Instance<ConcurrentChildCommandsExecutionCallback> callbackProvider;
 
     public RemoveDiskCommand(T parameters, CommandContext commandContext) {
         super(parameters, commandContext);
@@ -398,7 +403,7 @@ private boolean canRemoveVmImageDisk() {
 
     @Override
     protected void executeCommand() {
-        switch (getDisk().getDiskStorageType()) {
+        switch (getDiskStorageType()) {
             case IMAGE:
                 if (getDisk().getContentType() == DiskContentType.MEMORY_DUMP_VOLUME ||
                         getDisk().getContentType() == DiskContentType.MEMORY_METADATA_VOLUME) {
@@ -448,6 +453,7 @@ protected void executeCommand() {
         if (getParameters().isUnregisteredDisk()) {
             unregisteredDisksDao.removeUnregisteredDisk(getParameters().getDiskId(), getParameters().getStorageDomainId());
         }
+        persistCommandIfNeeded();
     }
 
     private void removeManagedBlockStorageDisk() {
@@ -510,7 +516,7 @@ private RemoveImageParameters buildRemoveImageParameters(DiskImage diskImage) {
         RemoveImageParameters result = new RemoveImageParameters(diskImage.getImageId());
         result.setTransactionScopeOption(TransactionScopeOption.Suppress);
         result.setDiskImage(diskImage);
-        result.setParentCommand(ActionType.RemoveDisk);
+        result.setParentCommand(getActionType());
         result.setEntityInfo(new EntityInfo(VdcObjectType.Disk, getParameters().getDiskId()));
         result.setParentParameters(getParameters());
         result.setRemoveFromSnapshots(true);
@@ -728,4 +734,16 @@ private Guid getQuotaId() {
     @Override
     public void addQuotaPermissionSubject(List<PermissionSubject> quotaPermissionList) {
     }
+
+    private DiskStorageType getDiskStorageType() {
+        if (getParameters().getDiskStorageType() == null) {
+            getParameters().setDiskStorageType(getDisk().getDiskStorageType());
+        }
+        return getParameters().getDiskStorageType();
+    }
+
+    @Override
+    public CommandCallback getCallback() {
+        return getDiskStorageType() == DiskStorageType.IMAGE ? callbackProvider.get() :  null;
+    }
 }

backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/RemoveAllVmImagesCommand.java

@@ -9,12 +9,15 @@
 import java.util.List;
 import java.util.Set;
 
+import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 
+import org.ovirt.engine.core.bll.ConcurrentChildCommandsExecutionCallback;
 import org.ovirt.engine.core.bll.InternalCommandAttribute;
 import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute;
 import org.ovirt.engine.core.bll.VmCommand;
 import org.ovirt.engine.core.bll.context.CommandContext;
+import org.ovirt.engine.core.bll.tasks.interfaces.CommandCallback;
 import org.ovirt.engine.core.common.action.ActionReturnValue;
 import org.ovirt.engine.core.common.action.ActionType;
 import org.ovirt.engine.core.common.action.RemoveAllVmImagesParameters;
@@ -47,6 +50,8 @@ public class RemoveAllVmImagesCommand<T extends RemoveAllVmImagesParameters> ext
     private DiskImageDao diskImageDao;
     @Inject
     private ImageDao imageDao;
+    @Inject
+    private Instance<ConcurrentChildCommandsExecutionCallback> callbackProvider;
 
     public RemoveAllVmImagesCommand(T parameters, CommandContext cmdContext) {
         super(parameters, cmdContext);
@@ -142,4 +147,8 @@ protected void endVmCommand() {
             super.endVmCommand();
         }
     }
+
+    public CommandCallback getCallback() {
+        return callbackProvider.get();
+    }
 }