Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #71 from cheng--zhang/CA-135563

Browse Source 
CA-135563:WLB tab show error message after disconnect WLB by Read-Only user
This commit is contained in:
Gabor Apati-Nagy 2014-05-16 14:41:19 +01:00
commit 728efca6e2
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
XenModel/Actions/WLB/DisableWLBAction.cs
View File

@ -82,13 +82,13 @@ namespace XenAdmin.Actions.Wlb
log.Debug("Success disconnecting Workload Balancing on pool " + Pool.Name); log.Debug("Success disconnecting Workload Balancing on pool " + Pool.Name);
this.Description = Messages.COMPLETED; this.Description = Messages.COMPLETED;
WlbServerState.SetState(Pool, WlbServerState.ServerState.NotConfigured); WlbServerState.SetState(this.Session, Pool, WlbServerState.ServerState.NotConfigured);
} }
catch (Exception ex) catch (Exception ex)
{ {
//Force disabling of WLB //Force disabling of WLB
XenAPI.Pool.set_wlb_enabled(this.Session, Pool.opaque_ref, false); XenAPI.Pool.set_wlb_enabled(this.Session, Pool.opaque_ref, false);
WlbServerState.SetState(Pool, WlbServerState.ServerState.ConnectionError, (Failure)ex); WlbServerState.SetState(this.Session, Pool, WlbServerState.ServerState.ConnectionError, (Failure)ex);
log.Debug(string.Format(Messages.ACTION_WLB_DECONFIGURE_FAILED, Pool.Name, ex.Message)); log.Debug(string.Format(Messages.ACTION_WLB_DECONFIGURE_FAILED, Pool.Name, ex.Message));
throw new Exception(string.Format(Messages.ACTION_WLB_DECONFIGURE_FAILED, Pool.Name, ex.Message)); throw new Exception(string.Format(Messages.ACTION_WLB_DECONFIGURE_FAILED, Pool.Name, ex.Message));
} }
@ -106,13 +106,13 @@ namespace XenAdmin.Actions.Wlb
XenAPI.Pool.set_wlb_enabled(this.Session, Pool.opaque_ref, false); XenAPI.Pool.set_wlb_enabled(this.Session, Pool.opaque_ref, false);
log.Debug("Success pausing Workload Balancing on pool " + Pool.Name); log.Debug("Success pausing Workload Balancing on pool " + Pool.Name);
this.Description = Messages.COMPLETED; this.Description = Messages.COMPLETED;
WlbServerState.SetState(Pool, WlbServerState.ServerState.Disabled); WlbServerState.SetState(this.Session, Pool, WlbServerState.ServerState.Disabled);
} }
catch (Exception ex) catch (Exception ex)
{ {
if (ex is Failure) if (ex is Failure)
{ {
WlbServerState.SetState(Pool, WlbServerState.ServerState.ConnectionError, (Failure)ex); WlbServerState.SetState(this.Session, Pool, WlbServerState.ServerState.ConnectionError, (Failure)ex);
} }
throw ex; throw ex;
} }

32
XenModel/WLB/WlbServerState.cs
View File

@ -78,9 +78,8 @@ namespace XenAdmin.Wlb
/// <param name="state">The current state of the pool's Wlb Server State</param> /// <param name="state">The current state of the pool's Wlb Server State</param>
public static void SetState(Pool pool, ServerState state) public static void SetState(Pool pool, ServerState state)
{ {
SetState(pool, state, null); SetState(pool.Connection.Session, pool, state, null);
} }
/// <summary> /// <summary>
/// Public method for updating the Wlb Server state. If the state is ConnectionFailure and /// Public method for updating the Wlb Server state. If the state is ConnectionFailure and
/// a Failure is supplied, it's message is stored in the OtherConfig /// a Failure is supplied, it's message is stored in the OtherConfig
@ -89,6 +88,29 @@ namespace XenAdmin.Wlb
/// <param name="state">The current state of the pool's Wlb Server State</param> /// <param name="state">The current state of the pool's Wlb Server State</param>
/// <param name="failure">The Failure (if any) describing the Connection Error</param> /// <param name="failure">The Failure (if any) describing the Connection Error</param>
public static void SetState(Pool pool, ServerState state, Failure failure) public static void SetState(Pool pool, ServerState state, Failure failure)
{
SetState(pool.Connection.Session, pool, state, failure);
}
/// <summary>
/// Public method for updating the Wlb Server state when there is no error (Failure) and need specific seesion information.
/// This method clears any existing failure message for the connection
/// </summary>
/// <param name="session">The User session use to do this operation</param>
/// <param name="pool">The pool who's Wlb connection state we are updating</param>
/// <param name="state">The current state of the pool's Wlb Server State</param>
public static void SetState(Session session, Pool pool, ServerState state)
{
SetState(session, pool, state, null);
}
/// <summary>
/// Public method for updating the Wlb Server state. If the state is ConnectionFailure and
/// a Failure is supplied, it's message is stored in the OtherConfig
/// </summary>
/// <param name="session">The User session use to do this operation</param>
/// <param name="pool">The pool who's Wlb connection state we are updating</param>
/// <param name="state">The current state of the pool's Wlb Server State</param>
/// <param name="failure">The Failure (if any) describing the Connection Error</param>
public static void SetState(Session session, Pool pool, ServerState state, Failure failure)
{ {
//only update the state if new value if different than current value //only update the state if new value if different than current value
// this is to cut down on unneeded Pool_PropertiesChanged events // this is to cut down on unneeded Pool_PropertiesChanged events
@ -97,7 +119,7 @@ namespace XenAdmin.Wlb
// set a lock so we are setting state one at a time // set a lock so we are setting state one at a time
lock (_lockObject) lock (_lockObject)
{ {
Helpers.SetOtherConfig(pool.Connection.Session, pool, WLB_CONNECTION_STATUS, state.ToString()); Helpers.SetOtherConfig(session, pool, WLB_CONNECTION_STATUS, state.ToString());
if (null != failure && state == ServerState.ConnectionError) if (null != failure && state == ServerState.ConnectionError)
{ {
@ -110,11 +132,11 @@ namespace XenAdmin.Wlb
{ {
error = failure.Message; error = failure.Message;
} }
Helpers.SetOtherConfig(pool.Connection.Session, pool, WLB_CONNECTION_ERROR, error); Helpers.SetOtherConfig(session, pool, WLB_CONNECTION_ERROR, error);
} }
else else
{ {
Helpers.SetOtherConfig(pool.Connection.Session, pool, WLB_CONNECTION_ERROR, String.Empty); Helpers.SetOtherConfig(session, pool, WLB_CONNECTION_ERROR, String.Empty);
} }
} }
} }