Commit ee6c021d authored by Nick Craver's avatar Nick Craver

Cleanup: PhysicalBridge

parent deec3fec
......@@ -62,8 +62,8 @@ public enum State : byte
ConnectedEstablishing,
ConnectedEstablished,
Disconnected
}
}
public Exception LastException { get; private set; }
public ConnectionType ConnectionType { get; }
......@@ -122,7 +122,7 @@ public bool TryEnqueue(Message message, bool isSlave)
{
// you can go in the queue, but we won't be starting
// a worker, because the handshake has not completed
queue.Push(message);
queue.Push(message);
message.SetEnqueued();
return true;
}
......@@ -133,7 +133,7 @@ public bool TryEnqueue(Message message, bool isSlave)
}
}
bool reqWrite = queue.Push(message);
bool reqWrite = queue.Push(message);
message.SetEnqueued();
LogNonPreferred(message.Flags, isSlave);
Trace("Now pending: " + GetPendingCount());
......@@ -144,7 +144,7 @@ public bool TryEnqueue(Message message, bool isSlave)
}
return true;
}
internal void AppendProfile(StringBuilder sb)
{
var clone = new long[ProfileLogSamples + 1];
......@@ -299,7 +299,7 @@ internal void OnConnectionFailed(PhysicalConnection connection, ConnectionFailur
{
if (reportNextFailure)
{
LastException = innerException;
LastException = innerException;
reportNextFailure = false; // until it is restored
var endpoint = ServerEndPoint.EndPoint;
Multiplexer.OnConnectionFailed(endpoint, ConnectionType, failureType, innerException, reconfigureNextFailure);
......@@ -381,7 +381,7 @@ internal void OnHeartbeat(bool ifConnectedOnly)
bool shouldRetry = Multiplexer.RawConfig.ReconnectRetryPolicy.ShouldRetry(Interlocked.Read(ref connectTimeoutRetryCount), connectTimeMilliseconds);
if (shouldRetry)
{
Interlocked.Increment(ref connectTimeoutRetryCount);
Interlocked.Increment(ref connectTimeoutRetryCount);
LastException = ExceptionFactory.UnableToConnect(Multiplexer.RawConfig.AbortOnConnectFail, "ConnectTimeout");
Trace("Aborting connect");
// abort and reconnect
......@@ -534,8 +534,8 @@ internal bool WriteMessageDirect(PhysicalConnection tmp, Message next)
next.Fail(ConnectionFailureType.ProtocolFailure, null);
CompleteSyncOrAsync(next);
return false;
}
//The parent message (next) may be returned from GetMessages
}
//The parent message (next) may be returned from GetMessages
//and should not be marked as sent again below
messageIsSent = messageIsSent || subCommand == next;
}
......@@ -725,12 +725,12 @@ private void LogNonPreferred(CommandFlags flags, bool isSlave)
}
}
}
private void OnInternalError(Exception exception, [CallerMemberName] string origin = null)
{
Multiplexer.OnInternalError(exception, ServerEndPoint.EndPoint, ConnectionType, origin);
}
private void SelectDatabase(PhysicalConnection connection, Message message)
{
int db = message.Db;
......@@ -740,13 +740,13 @@ private void SelectDatabase(PhysicalConnection connection, Message message)
if (sel != null)
{
connection.Enqueue(sel);
sel.WriteImpl(connection);
sel.WriteImpl(connection);
sel.SetRequestSent();
IncrementOpCount();
}
}
}
private bool WriteMessageToServer(PhysicalConnection connection, Message message)
{
if (message == null) return true;
......@@ -768,7 +768,7 @@ private bool WriteMessageToServer(PhysicalConnection connection, Message message
if (readmode != null)
{
connection.Enqueue(readmode);
readmode.WriteTo(connection);
readmode.WriteTo(connection);
readmode.SetRequestSent();
IncrementOpCount();
}
......@@ -777,7 +777,7 @@ private bool WriteMessageToServer(PhysicalConnection connection, Message message
{
var asking = ReusableAskingCommand;
connection.Enqueue(asking);
asking.WriteImpl(connection);
asking.WriteImpl(connection);
asking.SetRequestSent();
IncrementOpCount();
}
......@@ -796,8 +796,8 @@ private bool WriteMessageToServer(PhysicalConnection connection, Message message
}
connection.Enqueue(message);
message.WriteImpl(connection);
message.SetRequestSent();
message.WriteImpl(connection);
message.SetRequestSent();
IncrementOpCount();
// some commands smash our ability to trust the database; some commands
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment