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

Removes deprecated fields from BuildDiskUsageAction #79

Merged
merged 1 commit into from
Mar 7, 2023
Merged

Removes deprecated fields from BuildDiskUsageAction #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 4 additions & 52 deletions src/main/java/hudson/plugins/disk_usage/BuildDiskUsageAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
package hudson.plugins.disk_usage;

import hudson.FilePath;
import java.io.IOException;
import java.util.Set;

import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
import hudson.model.Action;
import hudson.model.BuildBadgeAction;
import hudson.model.ItemGroup;
import hudson.model.Node;
import hudson.model.ProminentProjectAction;
import hudson.model.Run;
import hudson.model.TopLevelItem;
import java.io.IOException;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import jenkins.model.RunAction2;
import org.apache.commons.io.FileUtils;
import org.kohsuke.stapler.export.ExportedBean;

/**
Expand All @@ -26,11 +20,7 @@
@ExportedBean(defaultVisibility = 1)
public class BuildDiskUsageAction implements ProminentProjectAction, BuildBadgeAction, RunAction2 {

@Deprecated
Long buildDiskUsage;
AbstractBuild build;
@Deprecated
DiskUsage diskUsage;

public BuildDiskUsageAction(AbstractBuild build) {
this.build = build;
Expand Down Expand Up @@ -117,26 +107,6 @@ private Long getBuildsDiskUsageAllSubItems(ItemGroup group) {
return buildsDiskUsage;
}

public Object readResolve() {
// for keeping backward compatibility
if(diskUsage != null) {
buildDiskUsage = diskUsage.buildUsage;
Node node = build.getBuiltOn();
if(node != null && diskUsage.wsUsage != null && diskUsage.wsUsage > 0) {
DiskUsageProperty property = (DiskUsageProperty) build.getProject().getProperty(DiskUsageProperty.class);
AbstractProject<?,?> project = build.getProject().getRootProject();
if(property != null && (project instanceof TopLevelItem)) {
final var workspaceFor = node.getWorkspaceFor((TopLevelItem) project);
if (workspaceFor!=null){
property.putAgentWorkspaceSize(node, workspaceFor.getRemote(), diskUsage.wsUsage);
}
}
}
diskUsage = null;
}
return this;
}

@Override
public void onAttached(Run<?, ?> r) {
// no action is needed
Expand All @@ -149,25 +119,7 @@ public void onLoad(Run<?, ?> r) {
if(property == null) {
return;
}
// backward compatibility
BuildDiskUsageAction action = null;
for(Action a: build.getActions()) {
if(a instanceof BuildDiskUsageAction) {
action = (BuildDiskUsageAction) a;
if(action.buildDiskUsage != null) {
size = action.buildDiskUsage;
}
}
}
if(action != null) {
// remove old action, now it is added by transition action factory
build.getActions().remove(action);
try {
build.save();
} catch (IOException ex) {
Logger.getLogger(BuildDiskUsageAction.class.getName()).log(Level.SEVERE, null, ex);
}
}

// Transient actions can be created even during deletion of job
if(property.getDiskUsageBuildInformation(build.getNumber()) == null && build.getRootDir().exists()) {
property.getDiskUsage().addBuildInformation(new DiskUsageBuildInformation(build.getId(), build.getTimeInMillis(), build.getNumber(), size), build);
Expand Down
62 changes: 11 additions & 51 deletions src/main/java/hudson/plugins/disk_usage/ProjectDiskUsage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,6 @@
*/
package hudson.plugins.disk_usage;

import com.google.common.collect.Maps;
import hudson.BulkChange;
import hudson.XmlFile;
import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
import hudson.model.Action;
import hudson.model.Job;
import hudson.model.Node;
import hudson.model.Run;
import hudson.model.Saveable;
import hudson.model.listeners.SaveableListener;
import java.io.File;
import java.io.IOException;
import java.util.HashSet;
Expand All @@ -26,6 +15,17 @@
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.logging.Level;
import java.util.logging.Logger;

import com.google.common.collect.Maps;
import hudson.BulkChange;
import hudson.XmlFile;
import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
import hudson.model.Job;
import hudson.model.Node;
import hudson.model.Run;
import hudson.model.Saveable;
import hudson.model.listeners.SaveableListener;
import jenkins.model.Jenkins;
import org.apache.commons.io.FileUtils;

Expand Down Expand Up @@ -149,26 +149,11 @@ public void loadAllBuilds() throws IOException {
continue;
}
AbstractBuild build = (AbstractBuild) run;
BuildDiskUsageAction toRemove = null;
long buildOldDiskUsage = 0L;
// if not present, add
for(Action action: build.getActions()) {
if(action instanceof BuildDiskUsageAction) {
toRemove = (BuildDiskUsageAction) action;
buildOldDiskUsage = toRemove.buildDiskUsage;
}
}
if(toRemove != null) {
build.getActions().remove(toRemove);
}
if(build.getWorkspace() != null) {
putAgentWorkspaceSize(build.getBuiltOn(), build.getWorkspace().getRemote(), 0l);
}
DiskUsageBuildInformation information = new DiskUsageBuildInformation(build.getId(), build.getTimeInMillis(), build.number, 0l);
addBuildInformation(information, build);
if(information.getSize() == 0l) {
information.setSize(buildOldDiskUsage);
}
}
}
allBuildsLoaded = true;
Expand All @@ -189,31 +174,6 @@ public synchronized void load() {
}
}

/**
* IT is only for backward compatibility to load old data. It breaks lazy loading.
* Should be used only one times - updating of plugin
*
* @deprecated
*
*/
public void loadOldData() {
buildDiskUsage = new CopyOnWriteArraySet<>();
List<Run> list = job.getBuilds();
for(Run run: list) {
if(run instanceof AbstractBuild) {
AbstractBuild build = (AbstractBuild) run;
BuildDiskUsageAction usage = run.getAction(BuildDiskUsageAction.class);
DiskUsageBuildInformation information = new DiskUsageBuildInformation(build.getId(), build.getTimeInMillis(), build.number, 0l);
addBuildInformation(information, build);
if(usage != null) {
information.setSize(usage.buildDiskUsage);
run.getAllActions().remove(usage);
}
}
}
save();
}

public DiskUsageBuildInformation getDiskUsageBuildInformation(int number) {
for(DiskUsageBuildInformation information: buildDiskUsage) {
if(information.getNumber() == number) {
Expand Down
14 changes: 0 additions & 14 deletions src/test/java/hudson/plugins/disk_usage/integration/DiskUsagePropertyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,20 +274,6 @@ public void testGetAllNonAgentOrCustomWorkspaceSizeWithMaster() throws Exception
assertEquals("", customWorkspaceAgentSize, project.getProperty(DiskUsageProperty.class).getAllNonAgentOrCustomWorkspaceSize(), 0);
}

@Test
@LocalData
public void testBackwadrCompatibility1() throws IOException {
j.jenkins.getPlugin(DiskUsagePlugin.class).getConfiguration().disableBuildsDiskUsageCalculation();
j.jenkins.getPlugin(DiskUsagePlugin.class).getConfiguration().disableJobsDiskUsageCalculation();
j.jenkins.getPlugin(DiskUsagePlugin.class).getConfiguration().disableWorkspacesDiskUsageCalculation();
AbstractProject project = (AbstractProject) j.jenkins.getItem("project1");
DiskUsageProperty property = (DiskUsageProperty) project.getProperty(DiskUsageProperty.class);
property.getDiskUsage().loadAllBuilds();
assertEquals("Size of project1 should be loaded from previous configuration.", 188357L, property.getAllDiskUsageWithoutBuilds(), 0);
assertEquals("Size of build 2 should be loaded from previous configuration.", 23932L, property.getDiskUsageOfBuild(2), 0);
}


@Test
@ReplaceHudsonHomeWithCurrentPath("jobs/project1/config.xml")
@LocalData
Expand Down
Binary file removed ...udson/plugins/disk_usage/integration/DiskUsagePropertyTest/testBackwadrCompatibility1.zip
View file
Open in desktop
Binary file not shown.