File tree Expand file tree Collapse file tree 1 file changed +14
-4
lines changed
client/src/main/scala/io/delta/sharing/client Expand file tree Collapse file tree 1 file changed +14
-4
lines changed Original file line number Diff line number Diff line change @@ -1132,10 +1132,20 @@ class DeltaSharingRestClient(
1132
1132
}
1133
1133
} catch {
1134
1134
case e : org.apache.http.ConnectionClosedException =>
1135
- val error = s " Request to delta sharing server failed " + getDsQueryIdForLogging +
1136
- s " due to ${e}. "
1137
- logError(error)
1138
- lineBuffer += error
1135
+ logError(s " Request to delta sharing server failed $getDsQueryIdForLogging " +
1136
+ s " due to ${e}. " )
1137
+ // takeRight(3) is safe even if the lineBuffer is empty or has fewer than 3 lines.
1138
+ val linesToLog = lineBuffer.takeRight(3 ).mkString(" \n " )
1139
+ logError(" Last 3 lines:" + linesToLog)
1140
+
1141
+ val error = s " Request to delta sharing server failed $getDsQueryIdForLogging " +
1142
+ s " due to ${e.getMessage}. "
1143
+ if (lineBuffer.nonEmpty) {
1144
+ val lastIndex = lineBuffer.length - 1
1145
+ lineBuffer(lastIndex) = (error + lineBuffer(lastIndex)).replace(' ' , '_' )
1146
+ } else {
1147
+ lineBuffer += error.replace(' ' , '_' )
1148
+ }
1139
1149
lineBuffer.toList
1140
1150
} finally {
1141
1151
input.close()
You can’t perform that action at this time.
0 commit comments