Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-12-30 07:40:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1044 from GaborApatiNagy/master_batch_new2

Browse Source 
CA-214566: Fix for: Upload succeeded, but Pool_patch hasn't been found
This commit is contained in:
Mihaela Stoica 2016-06-28 13:08:34 +01:00 committed by GitHub
commit 01b4e7a5b2
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
XenAdmin/Wizards/PatchingWizard/PlanActions/UploadPatchToMasterPlanAction.cs
View File

@ -79,10 +79,15 @@ namespace XenAdmin.Wizards.PatchingWizard.PlanActions
inProgressAction = uploadPatchAction; inProgressAction = uploadPatchAction;
uploadPatchAction.RunExternal(session); uploadPatchAction.RunExternal(session);
// this has to be run again to refresh poolPatches (to get the recently uploaded one as well)
poolPatches = new List<Pool_patch>(session.Connection.Cache.Pool_patches);
var poolPatch = poolPatches.Find(p => string.Equals(p.uuid, patch.Uuid, StringComparison.OrdinalIgnoreCase)); var poolPatch = poolPatches.Find(p => string.Equals(p.uuid, patch.Uuid, StringComparison.OrdinalIgnoreCase));
if (poolPatch == null) if (poolPatch == null)
{ {
//error log.ErrorFormat("Upload finished successfully, but Pool_patch object has not been found for patch (uuid={0}) on host (uuid={1}).", patch.Uuid, session.Connection);
throw new Exception(Messages.ACTION_UPLOADPATCHTOMASTERPLANACTION_FAILED);
} }
var newMapping = new PoolPatchMapping() var newMapping = new PoolPatchMapping()

9
XenModel/Messages.Designer.cs generated
View File

@ -2463,6 +2463,15 @@ namespace XenAdmin {
} }
} }
/// <summary>
/// Looks up a localized string similar to Upload error. The patch was uploaded, but it cannot be found on the host..
/// </summary>
public static string ACTION_UPLOADPATCHTOMASTERPLANACTION_FAILED {
get {
return ResourceManager.GetString("ACTION_UPLOADPATCHTOMASTERPLANACTION_FAILED", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Virtual disk created. /// Looks up a localized string similar to Virtual disk created.
/// </summary> /// </summary>

3
XenModel/Messages.resx
View File

@ -909,6 +909,9 @@
<data name="ACTION_UPDATE_INTEGRATED_GPU_PASSTHROUGH_TITLE" xml:space="preserve"> <data name="ACTION_UPDATE_INTEGRATED_GPU_PASSTHROUGH_TITLE" xml:space="preserve">
<value>Updating integrated GPU passthrough on '{0}'</value> <value>Updating integrated GPU passthrough on '{0}'</value>
</data> </data>
<data name="ACTION_UPLOADPATCHTOMASTERPLANACTION_FAILED" xml:space="preserve">
<value>Upload error. The patch was uploaded, but it cannot be found on the host.</value>
</data>
<data name="ACTION_UPLOAD_SERVER_STATUS_REPORT" xml:space="preserve"> <data name="ACTION_UPLOAD_SERVER_STATUS_REPORT" xml:space="preserve">
<value>Upload server status report to [Citrix] Insight Services</value> <value>Upload server status report to [Citrix] Insight Services</value>
</data> </data>