Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions manifests/zcloud-prod2/hpautoscaler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ metadata:
name: delta-sharing-server-hpa
namespace: default
spec:
minReplicas: 3
maxReplicas: 8
5 changes: 5 additions & 0 deletions server/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
</encoder>
</appender>

<!-- Native Hadoop libs are not present in the container image; the pure-Java
fallback works correctly for GCS-backed Delta tables. Suppress the WARN
so it doesn't pollute Cloud Logging. -->
<logger name="org.apache.hadoop.util.NativeCodeLoader" level="ERROR" />

<root level="INFO">
<appender-ref ref="GCP_JSON" />
</root>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1252,6 +1252,7 @@ object DeltaSharingService {
.defaultHostname(serverConfig.getHost)
.disableDateHeader()
.disableServerHeader()
.idleTimeout(java.time.Duration.ofSeconds(serverConfig.idleTimeoutSeconds))
.requestTimeout(java.time.Duration.ofSeconds(serverConfig.requestTimeoutSeconds))
.annotatedService(serverConfig.endpoint, service: Any)
if (serverConfig.ssl == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ case class ServerConfig(
@BeanProperty var refreshTokenTtlMs: Int,
// Whether to emit performance/timing log lines for table queries and CDF requests.
@BeanProperty var perfLoggingEnabled: Boolean,
// The idle connection timeout in seconds. Connections idle for longer than this are closed.
// Should be greater than the proxy's IdleConnTimeout to avoid stale-connection EOF errors.
// Set to 0 to use Armeria's built-in default (15 seconds).
@BeanProperty var idleTimeoutSeconds: Long,
// Access logging configuration for tracking share data egress via structured logs.
@BeanProperty var accessLogging: AccessLoggingConfig
) extends ConfigItem {
Expand All @@ -94,6 +98,7 @@ case class ServerConfig(
queryTablePageTokenTtlMs = 259200000, // 3 days
refreshTokenTtlMs = 3600000, // 1 hour
perfLoggingEnabled = true,
idleTimeoutSeconds = 120,
accessLogging = null
)
}
Expand Down
Loading