Gerrit emails - Returned mail: see transcript for details
Evgheni Dereveanchin
ederevea at redhat.com
Mon Oct 31 14:22:10 UTC 2016
Martin, this looks like a change in SPF enforcement
on Red Hat side as our Gerrit is effectively spoofing
sender emails. I've logged a JIRA ticket to get this
fixed by not using author's emails for Gerrit notifications:
https://ovirt-jira.atlassian.net/browse/OVIRT-799
Regards,
Evgheni Dereveanchin
----- Original Message -----
From: "Martin Sivak" <msivak at redhat.com>
To: "Eyal Edri" <eedri at redhat.com>, "Anton Marchukov" <amarchuk at redhat.com>, "infra" <infra at ovirt.org>
Sent: Monday, 31 October, 2016 2:28:17 PM
Subject: Gerrit emails - Returned mail: see transcript for details
Hi,
there might be something bad in our SPF config. Please check.
Martin
---------- Forwarded message ----------
From: Mail Delivery Subsystem <MAILER-DAEMON at gerrit.ovirt.org>
Date: Mon, Oct 31, 2016 at 2:05 PM
Subject: Returned mail: see transcript for details
To: msivak at redhat.com
The original message was received at Mon, 31 Oct 2016 09:05:24 -0400
from gerrit.ovirt.org [127.0.0.1]
----- The following addresses had permanent fatal errors -----
<laravot at redhat.com>
(reason: 551 5.7.1 SPF fail: 'gerrit.ovirt.org'[107.22.212.69],
'redhat.com'; REJECT)
<akrejcir at redhat.com>
(reason: 551 5.7.1 SPF fail: 'gerrit.ovirt.org'[107.22.212.69],
'redhat.com'; REJECT)
<ahadas at redhat.com>
(reason: 551 5.7.1 SPF fail: 'gerrit.ovirt.org'[107.22.212.69],
'redhat.com'; REJECT)
----- Transcript of session follows -----
... while talking to mx1.redhat.com.:
>>> DATA
<<< 551 5.7.1 SPF fail: 'gerrit.ovirt.org'[107.22.212.69], 'redhat.com'; REJECT
550 5.1.1 <ahadas at redhat.com>... User unknown
<<< 551 5.7.1 SPF fail: 'gerrit.ovirt.org'[107.22.212.69], 'redhat.com'; REJECT
550 5.1.1 <akrejcir at redhat.com>... User unknown
<<< 551 5.7.1 SPF fail: 'gerrit.ovirt.org'[107.22.212.69], 'redhat.com'; REJECT
550 5.1.1 <laravot at redhat.com>... User unknown
<<< 554 5.5.1 Error: no valid recipients
Final-Recipient: RFC822; laravot at redhat.com
Action: failed
Status: 5.7.1
Remote-MTA: DNS; mx1.redhat.com
Diagnostic-Code: SMTP; 551 5.7.1 SPF fail:
'gerrit.ovirt.org'[107.22.212.69], 'redhat.com'; REJECT
Last-Attempt-Date: Mon, 31 Oct 2016 09:05:25 -0400
Final-Recipient: RFC822; akrejcir at redhat.com
Action: failed
Status: 5.7.1
Remote-MTA: DNS; mx1.redhat.com
Diagnostic-Code: SMTP; 551 5.7.1 SPF fail:
'gerrit.ovirt.org'[107.22.212.69], 'redhat.com'; REJECT
Last-Attempt-Date: Mon, 31 Oct 2016 09:05:25 -0400
Final-Recipient: RFC822; ahadas at redhat.com
Action: failed
Status: 5.7.1
Remote-MTA: DNS; mx1.redhat.com
Diagnostic-Code: SMTP; 551 5.7.1 SPF fail:
'gerrit.ovirt.org'[107.22.212.69], 'redhat.com'; REJECT
Last-Attempt-Date: Mon, 31 Oct 2016 09:05:25 -0400
---------- Forwarded message ----------
From: msivak at redhat.com
To: Arik Hadas <ahadas at redhat.com>
Cc: Andrej Krejcir <akrejcir at redhat.com>, Liron Aravot <laravot at redhat.com>
Date: Mon, 31 Oct 2016 09:05:24 -0400
Subject: Change in ovirt-engine[master]: core: Update OVF in storage
domains for HE VM edit
Hello Arik Hadas,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/65085
to review the following change.
Change subject: core: Update OVF in storage domains for HE VM edit
......................................................................
core: Update OVF in storage domains for HE VM edit
Updating hosted engine VM saves OVF to storage domain as well as
to the DB.
This patch is complementary to: https://gerrit.ovirt.org/#/c/51842
Change-Id: Ib02d41136458677399428c62c8e475b4cb2fcb79
Bug-Url: https://bugzilla.redhat.com/1372000
Signed-off-by: Andrej Krejcir <akrejcir at redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ovfstore/OvfDataUpdater.java
2 files changed, 22 insertions(+), 22 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/65085/3
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
index 3c0bada..9c64003 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
@@ -22,6 +22,7 @@
import org.ovirt.engine.core.bll.quota.QuotaConsumptionParameter;
import org.ovirt.engine.core.bll.quota.QuotaSanityParameter;
import org.ovirt.engine.core.bll.quota.QuotaVdsDependent;
+import org.ovirt.engine.core.bll.storage.ovfstore.OvfDataUpdater;
import org.ovirt.engine.core.bll.utils.IconUtils;
import org.ovirt.engine.core.bll.utils.PermissionSubject;
import org.ovirt.engine.core.bll.validator.IconValidator;
@@ -37,7 +38,6 @@
import org.ovirt.engine.core.common.action.LockProperties;
import org.ovirt.engine.core.common.action.LockProperties.Scope;
import org.ovirt.engine.core.common.action.PlugAction;
-import org.ovirt.engine.core.common.action.ProcessOvfUpdateForStoragePoolParameters;
import org.ovirt.engine.core.common.action.RngDeviceParameters;
import org.ovirt.engine.core.common.action.UpdateVmVersionParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
@@ -178,7 +178,17 @@
// Trigger OVF update for hosted engine VM only
if (getVm().isHostedEngine()) {
- registerRollbackHandler(new HostedEngineEditNotifier(getVm()));
+ registerRollbackHandler(new TransactionCompletionListener() {
+ @Override
+ public void onSuccess() {
+ OvfDataUpdater.getInstance().triggerNow();
+ }
+
+ @Override
+ public void onRollback() {
+ // No notification is needed
+ }
+ });
}
// save user selected value for hotplug before overriding
with db values (when updating running vm)
@@ -1150,25 +1160,6 @@
public VmValidator createVmValidator(VM vm) {
return new VmValidator(vm);
- }
-
- private static class HostedEngineEditNotifier implements
TransactionCompletionListener {
- final VM vm;
-
- public HostedEngineEditNotifier(VM vm) {
- this.vm = vm;
- }
-
- @Override
- public void onSuccess() {
- Backend.getInstance().runInternalAction(VdcActionType.ProcessOvfUpdateForStoragePool,
- new
ProcessOvfUpdateForStoragePoolParameters(vm.getStoragePoolId()));
- }
-
- @Override
- public void onRollback() {
- // No notification is needed
- }
}
protected InClusterUpgradeValidator getClusterUpgradeValidator() {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ovfstore/OvfDataUpdater.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ovfstore/OvfDataUpdater.java
index 6dc3881..788e046 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ovfstore/OvfDataUpdater.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ovfstore/OvfDataUpdater.java
@@ -27,6 +27,8 @@
private static final Logger log =
LoggerFactory.getLogger(OvfDataUpdater.class);
private static final OvfDataUpdater INSTANCE = new OvfDataUpdater();
+ private volatile String updateTimerJobId;
+
private OvfDataUpdater() {
}
@@ -40,7 +42,7 @@
public void initOvfDataUpdater() {
SchedulerUtil scheduler = Injector.get(SchedulerUtilQuartzImpl.class);
- scheduler.scheduleAFixedDelayJob(this, "ovfUpdateTimer", new
Class[] {},
+ updateTimerJobId = scheduler.scheduleAFixedDelayJob(this,
"ovfUpdateTimer", new Class[] {},
new Object[] {}, Config.<Integer>
getValue(ConfigValues.OvfUpdateIntervalInMinutes),
Config.<Integer>
getValue(ConfigValues.OvfUpdateIntervalInMinutes), TimeUnit.MINUTES);
log.info("Initialization of OvfDataUpdater completed successfully.");
@@ -84,4 +86,11 @@
}
}
}
+
+ public void triggerNow() {
+ if (updateTimerJobId != null) {
+ SchedulerUtil scheduler =
Injector.get(SchedulerUtilQuartzImpl.class);
+ scheduler.triggerJob(updateTimerJobId);
+ }
+ }
}
--
To view, visit https://gerrit.ovirt.org/65085
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib02d41136458677399428c62c8e475b4cb2fcb79
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Andrej Krejcir <akrejcir at redhat.com>
Gerrit-Reviewer: Andrej Krejcir <akrejcir at redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Jenny Tokar <jtokar at redhat.com>
Gerrit-Reviewer: Liron Aravot <laravot at redhat.com>
Gerrit-Reviewer: Martin Sivák <msivak at redhat.com>
Gerrit-Reviewer: Phillip Bailey <phbailey at redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr at redhat.com>
Gerrit-Reviewer: Yanir Quinn <yquinn at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
_______________________________________________
Infra mailing list
Infra at ovirt.org
http://lists.ovirt.org/mailman/listinfo/infra
More information about the Infra
mailing list