Skip to content

Commit dffb254

Browse files
simonelbazsimonelbaz
committed
spotless applied
1 parent 31265fa commit dffb254

65 files changed

Lines changed: 2703 additions & 2028 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎plugin/src/main/java/jenkins/plugins/openstack/compute/InstancesToRun.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import hudson.model.Item;
88
import hudson.util.FormValidation;
99
import hudson.util.ListBoxModel;
10-
1110
import jenkins.model.Jenkins;
1211
import org.kohsuke.accmod.Restricted;
1312
import org.kohsuke.accmod.restrictions.NoExternalUse;

‎plugin/src/main/java/jenkins/plugins/openstack/compute/JCloudsBuildWrapper.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.google.common.util.concurrent.Futures;
66
import com.google.common.util.concurrent.ListenableFuture;
77
import com.google.common.util.concurrent.ListeningExecutorService;
8+
import com.google.common.util.concurrent.MoreExecutors;
89
import hudson.Extension;
910
import hudson.Functions;
1011
import hudson.Launcher;
@@ -15,7 +16,6 @@
1516
import hudson.model.Computer;
1617
import hudson.tasks.BuildWrapper;
1718
import hudson.tasks.BuildWrapperDescriptor;
18-
1919
import java.io.IOException;
2020
import java.util.ArrayList;
2121
import java.util.List;
@@ -24,20 +24,15 @@
2424
import java.util.concurrent.Callable;
2525
import java.util.concurrent.atomic.AtomicInteger;
2626
import java.util.stream.Collectors;
27-
2827
import javax.annotation.Nonnull;
29-
3028
import jenkins.plugins.openstack.compute.internal.DestroyMachine;
3129
import jenkins.plugins.openstack.compute.internal.Openstack;
32-
3330
import org.jenkinsci.plugins.resourcedisposer.AsyncResourceDisposer;
3431
import org.kohsuke.accmod.Restricted;
3532
import org.kohsuke.accmod.restrictions.NoExternalUse;
3633
import org.kohsuke.stapler.DataBoundConstructor;
3734
import org.openstack4j.model.compute.Server;
3835

39-
import com.google.common.util.concurrent.MoreExecutors;
40-
4136
public class JCloudsBuildWrapper extends BuildWrapper {
4237
private final List<InstancesToRun> instancesToRun;
4338

@@ -60,13 +55,16 @@ public Environment setUp(final AbstractBuild build, Launcher launcher, final Bui
6055
final ServerScope.Build scope = new ServerScope.Build(build);
6156

6257
// eagerly lookup node supplier so that errors occur before we attempt to provision things
63-
Iterable<NodePlan> nodePlans = instancesToRun.stream().map(instance -> {
64-
JCloudsCloud cloud = JCloudsCloud.getByName(Objects.requireNonNull(instance.cloudName));
65-
String templateName = Util.replaceMacro(instance.getActualTemplateName(), build.getBuildVariableResolver());
66-
JCloudsSlaveTemplate template = cloud.getTemplate(templateName);
67-
if (template == null) throw new IllegalArgumentException("No such template " + templateName);
68-
return new NodePlan(cloud, template, instance.count, scope);
69-
}).collect(Collectors.toList());
58+
Iterable<NodePlan> nodePlans = instancesToRun.stream()
59+
.map(instance -> {
60+
JCloudsCloud cloud = JCloudsCloud.getByName(Objects.requireNonNull(instance.cloudName));
61+
String templateName =
62+
Util.replaceMacro(instance.getActualTemplateName(), build.getBuildVariableResolver());
63+
JCloudsSlaveTemplate template = cloud.getTemplate(templateName);
64+
if (template == null) throw new IllegalArgumentException("No such template " + templateName);
65+
return new NodePlan(cloud, template, instance.count, scope);
66+
})
67+
.collect(Collectors.toList());
7068

7169
ListeningExecutorService executor = MoreExecutors.listeningDecorator(Computer.threadPoolForRemoting);
7270
final ImmutableList.Builder<RunningNode> cloudTemplateNodeBuilder = ImmutableList.builder();
@@ -78,10 +76,10 @@ public Environment setUp(final AbstractBuild build, Launcher launcher, final Bui
7876
for (final NodePlan nodePlan : nodePlans) {
7977
for (int i = 0; i < nodePlan.getCount(); i++) {
8078
final int index = i;
81-
listener.getLogger().printf(
82-
"Queuing cloud instance: #%d %s %s%n",
83-
index, nodePlan.getCloud(), nodePlan.getTemplate()
84-
);
79+
listener.getLogger()
80+
.printf(
81+
"Queuing cloud instance: #%d %s %s%n",
82+
index, nodePlan.getCloud(), nodePlan.getTemplate());
8583

8684
ListenableFuture<Server> provisionTemplate = executor.submit(nodePlan.getNodeSupplier());
8785

@@ -101,8 +99,7 @@ public void onFailure(@Nonnull Throwable t) {
10199
failedLaunches.incrementAndGet();
102100
listener.error(
103101
"Error while launching instance: #%d, %s %s:%n%s%n",
104-
index, nodePlan.getCloud(), nodePlan.getTemplate(), Functions.printThrowable(t)
105-
);
102+
index, nodePlan.getCloud(), nodePlan.getTemplate(), Functions.printThrowable(t));
106103
}
107104
};
108105
Futures.addCallback(provisionTemplate, callback, MoreExecutors.directExecutor());
@@ -112,7 +109,8 @@ public void onFailure(@Nonnull Throwable t) {
112109
}
113110

114111
// block until all complete
115-
List<Server> nodesActuallyLaunched = Futures.getUnchecked(Futures.successfulAsList(plannedInstancesBuilder.build()));
112+
List<Server> nodesActuallyLaunched =
113+
Futures.getUnchecked(Futures.successfulAsList(plannedInstancesBuilder.build()));
116114

117115
final ImmutableList<RunningNode> runningNode = cloudTemplateNodeBuilder.build();
118116

@@ -121,10 +119,11 @@ public void onFailure(@Nonnull Throwable t) {
121119
throw new IllegalStateException("One or more instances failed to launch.");
122120
}
123121

124-
assert runningNode.size() == nodesActuallyLaunched.size() : String.format(
125-
"expected nodes from callbacks to be the same count as those from the list of futures!%n" + "fromCallbacks:%s%nfromFutures%s%n",
126-
runningNode, nodesActuallyLaunched);
127-
122+
assert runningNode.size() == nodesActuallyLaunched.size()
123+
: String.format(
124+
"expected nodes from callbacks to be the same count as those from the list of futures!%n"
125+
+ "fromCallbacks:%s%nfromFutures%s%n",
126+
runningNode, nodesActuallyLaunched);
128127

129128
final String ipsString = getIpsString(runningNode);
130129
return new Environment() {
@@ -134,7 +133,8 @@ public void buildEnvVars(Map<String, String> env) {
134133
}
135134

136135
@Override
137-
public boolean tearDown(AbstractBuild build, final BuildListener listener) throws IOException, InterruptedException {
136+
public boolean tearDown(AbstractBuild build, final BuildListener listener)
137+
throws IOException, InterruptedException {
138138
terminateNodes(runningNode);
139139
return true;
140140
}
@@ -159,7 +159,7 @@ public boolean tearDown(AbstractBuild build, final BuildListener listener) throw
159159

160160
private static void terminateNodes(Iterable<RunningNode> runningNodes) {
161161
AsyncResourceDisposer disposer = AsyncResourceDisposer.get();
162-
for (RunningNode rn: runningNodes) {
162+
for (RunningNode rn : runningNodes) {
163163
disposer.dispose(new DestroyMachine(rn.getCloudName(), rn.getNode().getId()));
164164
}
165165
}

‎plugin/src/main/java/jenkins/plugins/openstack/compute/JCloudsCleanupThread.java‎

Lines changed: 43 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,27 @@
11
package jenkins.plugins.openstack.compute;
22

3+
import hudson.Extension;
4+
import hudson.model.AsyncPeriodicWork;
5+
import hudson.model.Executor;
6+
import hudson.model.Result;
7+
import hudson.model.TaskListener;
8+
import hudson.slaves.OfflineCause;
39
import java.util.ArrayList;
410
import java.util.HashMap;
511
import java.util.List;
612
import java.util.Map;
713
import java.util.NoSuchElementException;
814
import java.util.logging.Level;
915
import java.util.logging.Logger;
10-
11-
import com.google.common.collect.ArrayListMultimap;
12-
import com.google.common.collect.ListMultimap;
13-
import hudson.model.Executor;
14-
import hudson.model.Result;
15-
import hudson.slaves.OfflineCause;
16+
import javax.annotation.Nonnull;
1617
import jenkins.model.CauseOfInterruption;
1718
import jenkins.plugins.openstack.compute.internal.DestroyMachine;
1819
import jenkins.plugins.openstack.compute.internal.Openstack;
1920
import org.jenkinsci.plugins.resourcedisposer.AsyncResourceDisposer;
2021
import org.kohsuke.accmod.Restricted;
2122
import org.kohsuke.accmod.restrictions.NoExternalUse;
22-
23-
import hudson.Extension;
24-
import hudson.model.AsyncPeriodicWork;
25-
import hudson.model.TaskListener;
26-
import org.openstack4j.api.exceptions.ClientResponseException;
27-
import org.openstack4j.api.exceptions.StatusCode;
2823
import org.openstack4j.model.compute.Server;
2924

30-
import javax.annotation.Nonnull;
31-
3225
/**
3326
* Periodically ensure Jenkins and resources it manages in OpenStacks are not leaked.
3427
*
@@ -38,7 +31,8 @@
3831
* - Servers that are running longer than declared are terminated.
3932
* - Nodes with server missing are terminated.
4033
*/
41-
@Extension @Restricted(NoExternalUse.class)
34+
@Extension
35+
@Restricted(NoExternalUse.class)
4236
public final class JCloudsCleanupThread extends AsyncPeriodicWork {
4337
private static final Logger LOGGER = Logger.getLogger(JCloudsCleanupThread.class.getName());
4438

@@ -89,17 +83,20 @@ private void cleanOrphanedFips() {
8983
try {
9084
openstack.destroyFip(fip);
9185
} catch (Exception ex) {
92-
LOGGER.log(Level.WARNING, "Unable to release floating IP " + fip + " leaked from cloud " + cloud.name, ex);
86+
LOGGER.log(
87+
Level.WARNING,
88+
"Unable to release floating IP " + fip + " leaked from cloud " + cloud.name,
89+
ex);
9390
}
9491
}
9592
}
9693
}
9794

9895
private void setCloudLastCleanTime() {
99-
for (JCloudsCloud cloud : JCloudsCloud.getClouds()) {
100-
if ((System.currentTimeMillis() - cloud.getLastCleanTime()) < cloud.getCleanfreqToMillis()) continue;
101-
cloud.setLastCleanTime(System.currentTimeMillis());
102-
}
96+
for (JCloudsCloud cloud : JCloudsCloud.getClouds()) {
97+
if ((System.currentTimeMillis() - cloud.getLastCleanTime()) < cloud.getCleanfreqToMillis()) continue;
98+
cloud.setLastCleanTime(System.currentTimeMillis());
99+
}
103100
}
104101

105102
private void terminateNodesPendingDeletion() {
@@ -110,10 +107,14 @@ private void terminateNodesPendingDeletion() {
110107

111108
final OfflineCause offlineCause = comp.getNode().getFatalOfflineCause();
112109
if (comp.isPendingDelete()) {
113-
LOGGER.log(Level.INFO, "Deleting pending node " + comp.getName() + ". Reason: " + comp.getOfflineCause());
110+
LOGGER.log(
111+
Level.INFO, "Deleting pending node " + comp.getName() + ". Reason: " + comp.getOfflineCause());
114112
deleteComputer(comp);
115113
} else if (offlineCause != null) {
116-
LOGGER.log(Level.WARNING, "Deleting broken node " + comp.getName() + " (" + getTerminalDiagnosis(comp) + "). Reason: " + comp.getOfflineCause());
114+
LOGGER.log(
115+
Level.WARNING,
116+
"Deleting broken node " + comp.getName() + " (" + getTerminalDiagnosis(comp) + "). Reason: "
117+
+ comp.getOfflineCause());
117118

118119
deleteComputer(comp);
119120
}
@@ -158,7 +159,7 @@ private void deleteComputer(JCloudsComputer comp, CauseOfInterruption coi) {
158159
for (Executor e : comp.getExecutors()) {
159160
e.interrupt(Result.ABORTED, coi);
160161
}
161-
for(Executor e : comp.getOneOffExecutors()){
162+
for (Executor e : comp.getOneOffExecutors()) {
162163
e.interrupt(Result.ABORTED, coi);
163164
}
164165
comp.deleteSlave();
@@ -179,7 +180,8 @@ private void deleteComputer(JCloudsComputer comp, CauseOfInterruption coi) {
179180
for (Server server : servers) {
180181
ServerScope scope = ServerScope.extract(server);
181182
if (scope.isOutOfScope(server)) {
182-
LOGGER.info("Server " + server.getName() + " run out of its scope " + scope + ". Terminating: " + server);
183+
LOGGER.info("Server " + server.getName() + " run out of its scope " + scope + ". Terminating: "
184+
+ server);
183185
AsyncResourceDisposer.get().dispose(new DestroyMachine(jc.name, server.getId()));
184186
} else {
185187
runningServers.get(jc).add(server);
@@ -192,7 +194,7 @@ private void deleteComputer(JCloudsComputer comp, CauseOfInterruption coi) {
192194

193195
private void terminatesNodesWithoutServers(@Nonnull HashMap<JCloudsCloud, List<Server>> runningServers) {
194196
Map<String, JCloudsComputer> jenkinsComputers = new HashMap<>();
195-
for (JCloudsComputer computer: JCloudsComputer.getAll()) {
197+
for (JCloudsComputer computer : JCloudsComputer.getAll()) {
196198
JCloudsCloud cloud = JCloudsCloud.getByName(computer.getId().getCloudName());
197199
if ((System.currentTimeMillis() - cloud.getLastCleanTime()) < cloud.getCleanfreqToMillis()) continue;
198200

@@ -203,7 +205,7 @@ private void terminatesNodesWithoutServers(@Nonnull HashMap<JCloudsCloud, List<S
203205
}
204206

205207
// Eliminate computers we have servers for
206-
for (Map.Entry<JCloudsCloud, List<Server>> e: runningServers.entrySet()) {
208+
for (Map.Entry<JCloudsCloud, List<Server>> e : runningServers.entrySet()) {
207209
for (Server server : e.getValue()) {
208210
jenkinsComputers.remove(server.getId());
209211
}
@@ -226,21 +228,30 @@ private void terminatesNodesWithoutServers(@Nonnull HashMap<JCloudsCloud, List<S
226228
try { // Double check server does not exist before interrupting jobs
227229
Server explicitLookup = cloud.getOpenstack().getServerById(id);
228230
if (Openstack.isOccupied(explicitLookup)) {
229-
LOGGER.severe(getClass().getSimpleName() + " incorrectly detected orphaned computer for " + explicitLookup);
231+
LOGGER.severe(getClass().getSimpleName() + " incorrectly detected orphaned computer for "
232+
+ explicitLookup);
230233
continue; // Do not kill it
231234
}
232235
} catch (NoSuchElementException expected) {
233236
// Gone as expected
234237
}
235238

236-
String msg = "OpenStack server (" + id + ") is not running for computer " + computer.getName() + ". Terminating!";
239+
String msg = "OpenStack server (" + id + ") is not running for computer " + computer.getName()
240+
+ ". Terminating!";
237241
LOGGER.warning(msg);
238242
deleteComputer(computer, new MessageInterruption(msg));
239243
}
240244
}
241245

242-
@Override protected Level getNormalLoggingLevel() { return Level.OFF; }
243-
@Override protected Level getSlowLoggingLevel() { return Level.INFO; }
246+
@Override
247+
protected Level getNormalLoggingLevel() {
248+
return Level.OFF;
249+
}
250+
251+
@Override
252+
protected Level getSlowLoggingLevel() {
253+
return Level.INFO;
254+
}
244255

245256
private static class MessageInterruption extends CauseOfInterruption {
246257
private static final long serialVersionUID = 7125610351278586647L;
@@ -251,7 +262,8 @@ private MessageInterruption(String msg) {
251262
this.msg = msg;
252263
}
253264

254-
@Override public String getShortDescription() {
265+
@Override
266+
public String getShortDescription() {
255267
return msg;
256268
}
257269
}

0 commit comments

Comments
 (0)