ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Increase OE timeout to 60 seconds (#492)

Browse Source
This commit is contained in:
Karl Burtram
2017-10-12 16:56:20 -07:00
committed by GitHub
parent 0ab1dd4c55
commit 14e3b3a3f6
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/ObjectExplorerService.cs
View File

@@ -45,7 +45,6 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer
private readonly Lazy<Dictionary<string, HashSet<ChildFactory>>> applicableNodeChildFactories; private readonly Lazy<Dictionary<string, HashSet<ChildFactory>>> applicableNodeChildFactories;
private IMultiServiceProvider serviceProvider; private IMultiServiceProvider serviceProvider;
private ConnectedBindingQueue bindingQueue = new ConnectedBindingQueue(needsMetadata: false); private ConnectedBindingQueue bindingQueue = new ConnectedBindingQueue(needsMetadata: false);
private const int PrepopulateBindTimeout = 10000;
/// <summary> /// <summary>
@@ -391,13 +390,13 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer
{ {
try try
{ {
int timeout = (int)TimeSpan.FromSeconds(settings?.ExpandTimeout ?? ObjectExplorerSettings.DefaultExpandTimeout).TotalMilliseconds;
QueueItem queueItem = bindingQueue.QueueBindingOperation( QueueItem queueItem = bindingQueue.QueueBindingOperation(
key: bindingQueue.AddConnectionContext(session.ConnectionInfo, "OE"), key: bindingQueue.AddConnectionContext(session.ConnectionInfo, "OE"),
bindingTimeout: PrepopulateBindTimeout, bindingTimeout: timeout,
waitForLockTimeout: PrepopulateBindTimeout, waitForLockTimeout: timeout,
bindOperation: (bindingContext, cancelToken) => bindOperation: (bindingContext, cancelToken) =>
{ {
if (forceRefresh) if (forceRefresh)
{ {
nodes = node.Refresh().Select(x => x.ToNodeInfo()).ToArray(); nodes = node.Refresh().Select(x => x.ToNodeInfo()).ToArray();
@@ -453,10 +452,11 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer
return null; return null;
} }
int timeout = (int)TimeSpan.FromSeconds(settings?.CreateSessionTimeout ?? ObjectExplorerSettings.DefaultCreateSessionTimeout).TotalMilliseconds;
QueueItem queueItem = bindingQueue.QueueBindingOperation( QueueItem queueItem = bindingQueue.QueueBindingOperation(
key: bindingQueue.AddConnectionContext(connectionInfo), key: bindingQueue.AddConnectionContext(connectionInfo),
bindingTimeout: PrepopulateBindTimeout, bindingTimeout: timeout,
waitForLockTimeout: PrepopulateBindTimeout, waitForLockTimeout: timeout,
bindOperation: (bindingContext, cancelToken) => bindOperation: (bindingContext, cancelToken) =>
{ {
session = ObjectExplorerSession.CreateSession(connectionResult, serviceProvider, bindingContext.ServerConnection); session = ObjectExplorerSession.CreateSession(connectionResult, serviceProvider, bindingContext.ServerConnection);
@@ -465,6 +465,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer
sessionMap.AddOrUpdate(uri, session, (key, oldSession) => session); sessionMap.AddOrUpdate(uri, session, (key, oldSession) => session);
return session; return session;
}); });
queueItem.ItemProcessed.WaitOne(); queueItem.ItemProcessed.WaitOne();
if (queueItem.GetResultAsT<ObjectExplorerSession>() != null) if (queueItem.GetResultAsT<ObjectExplorerSession>() != null)
{ {
@@ -551,7 +552,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer
} }
else if (!task.IsCompleted) else if (!task.IsCompleted)
{ {
result.Exception = new TimeoutException($"Object Explorer task didn't completed in {timeoutInSec} seconds."); result.Exception = new TimeoutException($"Object Explorer task didn't complete within {timeoutInSec} seconds.");
} }
return result; return result;
} }

4
src/Microsoft.SqlTools.ServiceLayer/SqlContext/ObjectExplorerSettings.cs
View File

@@ -10,8 +10,8 @@ namespace Microsoft.SqlTools.ServiceLayer.SqlContext
/// </summary> /// </summary>
public class ObjectExplorerSettings public class ObjectExplorerSettings
{ {
public static int DefaultCreateSessionTimeout = 30; public static int DefaultCreateSessionTimeout = 60;
public static int DefaultExpandTimeout = 30; public static int DefaultExpandTimeout = 60;
public ObjectExplorerSettings() public ObjectExplorerSettings()
{ {