fix #174: increase named pipe connection attempt default

tjanczuk · Jun 26, 2012 · 3efa757 · 3efa757
1 parent 6bdc124
commit 3efa757
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 7 deletions.
diff --git a/src/config/iisnode_schema.xml b/src/config/iisnode_schema.xml
@@ -33,7 +33,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles%\nodejs\node.exe&quot;"/>
     <attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles%\iisnode\interceptor.js&quot;" />
     <attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
-    <attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="24"/>
+    <attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>
     <attribute name="namedPipeConnectionRetryDelay" type="uint" defaultValue="250"/>
     <attribute name="maxNamedPipeConnectionPoolSize" type="uint" defaultValue="512"/>
     <attribute name="maxNamedPipePooledConnectionAge" type="uint" defaultValue="30000"/>    

diff --git a/src/config/iisnode_schema_x64.xml b/src/config/iisnode_schema_x64.xml
@@ -33,7 +33,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles(x86)%\nodejs\node.exe&quot;"/>
     <attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles%\iisnode\interceptor.js&quot;" />
     <attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
-    <attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="24"/>
+    <attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>
     <attribute name="namedPipeConnectionRetryDelay" type="uint" defaultValue="250"/>
     <attribute name="maxNamedPipeConnectionPoolSize" type="uint" defaultValue="512"/>
     <attribute name="maxNamedPipePooledConnectionAge" type="uint" defaultValue="30000"/>

diff --git a/src/config/iisnode_schema_x64_wow.xml b/src/config/iisnode_schema_x64_wow.xml
@@ -33,7 +33,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles(x86)%\nodejs\node.exe&quot;"/>
     <attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles(x86)%\iisnode\interceptor.js&quot;" />
     <attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
-    <attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="24"/>
+    <attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>
     <attribute name="namedPipeConnectionRetryDelay" type="uint" defaultValue="250"/>
     <attribute name="maxNamedPipeConnectionPoolSize" type="uint" defaultValue="512"/>
     <attribute name="maxNamedPipePooledConnectionAge" type="uint" defaultValue="30000"/>

diff --git a/src/iisnode/cnodeprocess.cpp b/src/iisnode/cnodeprocess.cpp
@@ -35,6 +35,11 @@ CNodeProcess::~CNodeProcess()
 	}
 }
 
+BOOL CNodeProcess::HasProcessExited()
+{
+	return this->hasProcessExited;
+}
+
 HRESULT CNodeProcess::Initialize(IHttpContext* context)
 {
 	HRESULT hr;

diff --git a/src/iisnode/cnodeprocess.h b/src/iisnode/cnodeprocess.h
@@ -40,6 +40,7 @@ class CNodeProcess
 	void OnRequestCompleted(CNodeHttpStoredContext* context);	
 	void SignalWhenDrained(HANDLE handle);
 	char* TryGetLog(IHttpContext* context, DWORD* size);
+	BOOL HasProcessExited();
 };
 
 #endif
diff --git a/src/iisnode/cprotocolbridge.cpp b/src/iisnode/cprotocolbridge.cpp
@@ -656,6 +656,15 @@ void WINAPI CProtocolBridge::CreateNamedPipeConnection(DWORD error, DWORD bytesT
 				CProtocolBridge::SendEmptyResponse(ctx, 500, _T("Internal Server Error"), hr);
 			}
 		}
+		else if (ctx->GetNodeProcess()->HasProcessExited()) 
+		{
+			// the process has exited, likely due to initialization error
+			// stop trying to establish the named pipe connection to minimize the failure latency
+
+			ctx->GetNodeApplication()->GetApplicationManager()->GetEventProvider()->Log(
+				L"iisnode was unable to establish named pipe connection to the node.exe process before the process terminated", WINEVENT_LEVEL_ERROR, ctx->GetActivityId());
+			CProtocolBridge::SendEmptyResponse(ctx, 500, _T("Internal Server Error"), hr);
+		}
 		else 
 		{
 			ctx->SetConnectionRetryCount(retry + 1);

diff --git a/src/samples/configuration/iisnode.yml b/src/samples/configuration/iisnode.yml
@@ -31,7 +31,7 @@ maxConcurrentRequestsPerProcess: 1024
 # maxNamedPipeConnectionRetry - number of times IIS will retry to establish a named pipe connection with a
 # node process in order to send a new HTTP request
 
-maxNamedPipeConnectionRetry: 24
+maxNamedPipeConnectionRetry: 100
 
 # namedPipeConnectionRetryDelay - delay in milliseconds between connection retries
 

diff --git a/src/samples/configuration/readme.htm b/src/samples/configuration/readme.htm
@@ -148,7 +148,7 @@ <h2>
       node_env="%node_env%"
       nodeProcessCountPerApplication="1"
       maxConcurrentRequestsPerProcess="1024"
-      maxNamedPipeConnectionRetry="24"
+      maxNamedPipeConnectionRetry="100"
       namedPipeConnectionRetryDelay="250"      
       maxNamedPipeConnectionPoolSize="512"
       maxNamedPipePooledConnectionAge="30000"
@@ -221,7 +221,7 @@ <h2>
 # maxNamedPipeConnectionRetry - number of times IIS will retry to establish a named pipe connection with a
 # node process in order to send a new HTTP request
 
-maxNamedPipeConnectionRetry: 24
+maxNamedPipeConnectionRetry: 100
 
 # namedPipeConnectionRetryDelay - delay in milliseconds between connection retries
 

diff --git a/src/samples/configuration/web.config b/src/samples/configuration/web.config
@@ -113,7 +113,7 @@
       node_env="%node_env%"
       nodeProcessCountPerApplication="1"
       maxConcurrentRequestsPerProcess="1024"
-      maxNamedPipeConnectionRetry="24"
+      maxNamedPipeConnectionRetry="100"
       namedPipeConnectionRetryDelay="250"      
       maxNamedPipeConnectionPoolSize="512"
       maxNamedPipePooledConnectionAge="30000"