Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't follow gluster-volumes for virt-only cluster #503

Merged
merged 3 commits into from
Jul 14, 2022
Merged

Don't follow gluster-volumes for virt-only cluster #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c890a73
Don't follow gluster-volumes for virt-only cluster
Jun 28, 2022
a7d5c64
Don't follow gluster-volumes for virt-only cluster
Jun 28, 2022
9bbd4b3
Merge branch 'Dont_Follow_Cluster_Gluster_Volumes' of https://github.…
Jul 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions ...api/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import javax.ws.rs.core.Response;

import org.ovirt.engine.api.model.Action;
import org.ovirt.engine.api.model.ActionableResource;
import org.ovirt.engine.api.resource.AffinityGroupsResource;
import org.ovirt.engine.api.resource.AssignedCpuProfilesResource;
import org.ovirt.engine.api.resource.AssignedPermissionsResource;
Expand All @@ -16,6 +17,7 @@
import org.ovirt.engine.api.resource.gluster.GlusterVolumesResource;
import org.ovirt.engine.api.restapi.resource.gluster.BackendGlusterHooksResource;
import org.ovirt.engine.api.restapi.resource.gluster.BackendGlusterVolumesResource;
import org.ovirt.engine.api.restapi.resource.utils.LinksTreeNode;
import org.ovirt.engine.api.restapi.util.LinkHelper;
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.ActionParametersBase;
Expand Down Expand Up @@ -182,4 +184,26 @@ public ClusterEnabledFeaturesResource getEnabledFeaturesResource() {
public ClusterExternalProvidersResource getExternalNetworkProvidersResource() {
return inject(new BackendClusterExternalNetworkProvidersResource(guid));
}

@Override
public void follow(ActionableResource entity, LinksTreeNode linksTree) {
org.ovirt.engine.api.model.Cluster cluster = (org.ovirt.engine.api.model.Cluster)entity;
removeGlusterVolumesFromFollowTree(linksTree, cluster);
}

/**
* specific case:
*
* if this cluster does not have gluster-service (meaning it's virt-only), but
* the user has requested to follow it's gluster_volumes link, silently ignore
* this request. It doesn't make sense to the Engine and if it reaches it, an
* exception will be thrown (see: https://bugzilla.redhat.com/2079361)
*/
static void removeGlusterVolumesFromFollowTree(LinksTreeNode linksTree, org.ovirt.engine.api.model.Cluster cluster) {
final String GLUSTER_VOLUMES = "gluster_volumes";
if ((!cluster.isSetGlusterService() || !cluster.isGlusterService())
&& linksTree.pathExists(GLUSTER_VOLUMES)) {
linksTree.markAsFollowed(GLUSTER_VOLUMES);
}
}
}
10 changes: 10 additions & 0 deletions ...pi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClustersResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@

import javax.ws.rs.core.Response;

import org.ovirt.engine.api.model.ActionableResource;
import org.ovirt.engine.api.model.Clusters;
import org.ovirt.engine.api.model.Network;
import org.ovirt.engine.api.resource.ClusterResource;
import org.ovirt.engine.api.resource.ClustersResource;
import org.ovirt.engine.api.restapi.resource.utils.LinksTreeNode;
import org.ovirt.engine.api.restapi.util.LinkHelper;
import org.ovirt.engine.core.common.action.ActionType;
import org.ovirt.engine.core.common.action.ClusterOperationParameters;
Expand Down Expand Up @@ -148,4 +150,12 @@ protected org.ovirt.engine.api.model.Cluster doPopulate(org.ovirt.engine.api.mod

return cluster;
}

@Override
public void follow(ActionableResource entity, LinksTreeNode linksTree) {
Clusters clusters = (Clusters)entity;
for (org.ovirt.engine.api.model.Cluster cluster : clusters.getClusters()) {
BackendClusterResource.removeGlusterVolumesFromFollowTree(linksTree, cluster);
}
}
}