Update 10916

Author: weizhouapache

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

@@ -3483,11 +3483,11 @@ private Ternary<List<Long>, Integer, String[]> searchForDiskOfferingsIdsAndCount
                     diskOfferingSearch.and("displayOffering", diskOfferingSearch.entity().getDisplayOffering(), Op.EQ);
                 }
 
-                diskOfferingSearch.and("activeState", diskOfferingSearch.entity().getState(), Op.EQ);
-
                 SearchCriteria<DiskOfferingVO> sc = diskOfferingSearch.create();
                 sc.setParameters("computeOnly", false);
-                sc.setParameters("activeState", DiskOffering.State.Active);
+                if (state != null) {
+                    sc.setParameters("state", state);
+                }
 
                 sc.setJoinParameters("domainDetailsSearch", "domainId", domainId);