mnl/VM-Operator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 4 Wiki Activity Actions

More consistent logging.

Browse source
This commit is contained in:
Michael Lipp 2025-03-14 18:37:43 +01:00
parent 8bc413b2da
commit 197c21bc32
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/AbstractMonitor.java
View file

@ -220,6 +220,9 @@ public abstract class AbstractMonitor<O extends KubernetesObject,
new K8sObserver<>(objectClass, objectListClass, client, new K8sObserver<>(objectClass, objectListClass, client,
K8s.preferred(context, version), namespace, options) K8s.preferred(context, version), namespace, options)
.handler((c, r) -> { .handler((c, r) -> {
logger.fine(() -> "Resource " + context.getKind()
+ "/" + r.object.getMetadata().getName() + " "
+ r.type);
handleChange(c, r); handleChange(c, r);
}).onTerminated((o, t) -> { }).onTerminated((o, t) -> {
if (observerCounter.decrementAndGet() == 0) { if (observerCounter.decrementAndGet() == 0) {

1
org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/PodReconciler.java
View file

@ -91,6 +91,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
} }
// Create pod. First combine template and data and parse result // Create pod. First combine template and data and parse result
logger.fine(() -> "Create/update pod " + podStub.name());
var fmTemplate = fmConfig.getTemplate("runnerPod.ftl.yaml"); var fmTemplate = fmConfig.getTemplate("runnerPod.ftl.yaml");
StringWriter out = new StringWriter(); StringWriter out = new StringWriter();
fmTemplate.process(model, out); fmTemplate.process(model, out);

2
org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Reconciler.java
View file

@ -215,8 +215,6 @@ public class Reconciler extends Component {
throws ApiException, TemplateException, IOException { throws ApiException, TemplateException, IOException {
// Ownership relationships takes care of deletions // Ownership relationships takes care of deletions
if (event.type() == K8sObserver.ResponseType.DELETED) { if (event.type() == K8sObserver.ResponseType.DELETED) {
logger.fine(
() -> "VM \"" + event.vmDefinition().name() + "\" deleted");
return; return;
} }

4
org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/VmMonitor.java
View file

@ -205,13 +205,13 @@ public class VmMonitor extends
= K8sV1PodStub.list(client, namespace(), podSearch); = K8sV1PodStub.list(client, namespace(), podSearch);
for (var podStub : podList) { for (var podStub : podList) {
var nodeName = podStub.model().get().getSpec().getNodeName(); var nodeName = podStub.model().get().getSpec().getNodeName();
logger.fine(() -> "Adding node name " + nodeName logger.finer(() -> "Adding node name " + nodeName
+ " to VM info for " + vmDef.name()); + " to VM info for " + vmDef.name());
@SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops") @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
var addrs = new ArrayList<String>(); var addrs = new ArrayList<String>();
podStub.model().get().getStatus().getPodIPs().stream() podStub.model().get().getStatus().getPodIPs().stream()
.map(ip -> ip.getIp()).forEach(addrs::add); .map(ip -> ip.getIp()).forEach(addrs::add);
logger.fine(() -> "Adding node addresses " + addrs logger.finer(() -> "Adding node addresses " + addrs
+ " to VM info for " + vmDef.name()); + " to VM info for " + vmDef.name());
extra.nodeInfo(nodeName, addrs); extra.nodeInfo(nodeName, addrs);
} }