> > @@ -184,7 +184,7 @@ class LUInstanceShutdown(LogicalUnit): > > > > """ > > env = BuildInstanceHookEnvByObject(self, self.instance) > > - env["SHUTDOWN_TIMEOUT"] = self.op.shutdown_timeout > > + env["TIMEOUT"] = self.op.timeout > > > > Hmm, how is this related?
As strange as it may sound, this is actually the code that was there before I started making modifications. I thought I had updated all the references, but apparently I missed some. I'm just putting it back because it broke the QA. I would like to fix the inconsistency afterwards. > > diff --git a/src/Ganeti/OpCodes.hs b/src/Ganeti/OpCodes.hs > > index 764cce4..b1d7382 100644 > > --- a/src/Ganeti/OpCodes.hs > > +++ b/src/Ganeti/OpCodes.hs > > @@ -530,7 +530,7 @@ $(genOpCode "OpCode" > > , pInstanceUuid > > , pForce > > , pIgnoreOfflineNodes > > - , pShutdownTimeout > > + , pShutdownTimeout' > > > > Isn't there a somewhat better name than pShutdownTimeout' ? This name does > not really explain why we need two of them... Again, I'm just putting this back because it broke the QA. This is inconsistent and it should be fixed. > -- > Thomas Thrainer | Software Engineer | [email protected] | > > Google Germany GmbH > Dienerstr. 12 > 80331 München > > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschäftsführer: Graham Law, Christine Elizabeth Flores -- Jose Antonio Lopes Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
