add forceTcp and keepSocket options

leo-astorsky · Aug 13, 2024 · 9e48e21 · 9e48e21
1 parent 17369f6
commit 9e48e21
Show file tree

Hide file tree

Showing 40 changed files with 124 additions and 6 deletions.
diff --git a/api/v1/ytsaurus_types.go b/api/v1/ytsaurus_types.go
@@ -571,6 +571,13 @@ type CommonSpec struct {
 	//+kubebuilder:default:=false
 	//+optional
 	UseIPv4 bool `json:"useIpv4"`
+	//+kubebuilder:default:=true
+	//+optional
+	KeepSocket bool `json:"keepSocket"`
+	//+kubebuilder:default:=false
+	//+optional
+	ForceTcp bool `json:"forceTcp"`
+
 	//+kubebuilder:default:=true
 	//+optional
 	UseShortNames bool `json:"useShortNames"`

diff --git a/config/crd/bases/cluster.ytsaurus.tech_remoteexecnodes.yaml b/config/crd/bases/cluster.ytsaurus.tech_remoteexecnodes.yaml
@@ -689,6 +689,9 @@ spec:
                 additionalProperties:
                   type: string
                 type: object
+              forceTcp:
+                default: false
+                type: boolean
               hostNetwork:
                 default: false
                 description: Use the host's network namespace for all components.
@@ -901,6 +904,9 @@ spec:
                       resources required.
                     type: object
                 type: object
+              keepSocket:
+                default: true
+                type: boolean
               locations:
                 items:
                   properties:

diff --git a/config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml b/config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml
@@ -10024,6 +10024,9 @@ spec:
                 additionalProperties:
                   type: string
                 type: object
+              forceTcp:
+                default: false
+                type: boolean
               hostNetwork:
                 default: false
                 description: Use the host's network namespace for all components.
@@ -12495,6 +12498,9 @@ spec:
               jobImage:
                 description: Default docker image for user jobs.
                 type: string
+              keepSocket:
+                default: true
+                type: boolean
               masterCaches:
                 properties:
                   affinity:

diff --git a/docs/api.md b/docs/api.md
@@ -239,6 +239,8 @@ _Appears in:_
 | `ephemeralCluster` _boolean_ | Allow prioritizing performance over data safety. Useful for tests and experiments. | false |  |
 | `useIpv6` _boolean_ |  | false |  |
 | `useIpv4` _boolean_ |  | false |  |
+| `keepSocket` _boolean_ |  | true |  |
+| `forceTcp` _boolean_ |  | false |  |
 | `useShortNames` _boolean_ |  | true |  |
 | `hostNetwork` _boolean_ | Use the host's network namespace for all components. | false |  |
 | `usePorto` _boolean_ |  | false |  |
@@ -1145,6 +1147,8 @@ _Appears in:_
 | `ephemeralCluster` _boolean_ | Allow prioritizing performance over data safety. Useful for tests and experiments. | false |  |
 | `useIpv6` _boolean_ |  | false |  |
 | `useIpv4` _boolean_ |  | false |  |
+| `keepSocket` _boolean_ |  | true |  |
+| `forceTcp` _boolean_ |  | false |  |
 | `useShortNames` _boolean_ |  | true |  |
 | `hostNetwork` _boolean_ | Use the host's network namespace for all components. | false |  |
 | `usePorto` _boolean_ |  | false |  |
@@ -1693,6 +1697,8 @@ _Appears in:_
 | `ephemeralCluster` _boolean_ | Allow prioritizing performance over data safety. Useful for tests and experiments. | false |  |
 | `useIpv6` _boolean_ |  | false |  |
 | `useIpv4` _boolean_ |  | false |  |
+| `keepSocket` _boolean_ |  | true |  |
+| `forceTcp` _boolean_ |  | false |  |
 | `useShortNames` _boolean_ |  | true |  |
 | `hostNetwork` _boolean_ | Use the host's network namespace for all components. | false |  |
 | `usePorto` _boolean_ |  | false |  |

diff --git a/pkg/ytconfig/canondata/TestGetControllerAgentsConfig/test.canondata b/pkg/ytconfig/canondata/TestGetControllerAgentsConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetDataNodeConfig/with-trash-ttl/test.canondata b/pkg/ytconfig/canondata/TestGetDataNodeConfig/with-trash-ttl/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetDataNodeConfig/with-watermark/test.canondata b/pkg/ytconfig/canondata/TestGetDataNodeConfig/with-watermark/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetDataNodeConfig/without-trash-ttl/test.canondata b/pkg/ytconfig/canondata/TestGetDataNodeConfig/without-trash-ttl/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetDataNodeWithoutYtsaurusConfig/test.canondata b/pkg/ytconfig/canondata/TestGetDataNodeWithoutYtsaurusConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%false;
         "enable_ipv6"=%true;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetDiscoveryConfig/test.canondata b/pkg/ytconfig/canondata/TestGetDiscoveryConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetExecNodeConfig/with-job-resources/test.canondata b/pkg/ytconfig/canondata/TestGetExecNodeConfig/with-job-resources/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetExecNodeConfig/without-job-resources/test.canondata b/pkg/ytconfig/canondata/TestGetExecNodeConfig/without-job-resources/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/...ondata/TestGetExecNodeConfigWithCri/isolated-containers-with-job-resources/test.canondata b/...ondata/TestGetExecNodeConfigWithCri/isolated-containers-with-job-resources/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/...ata/TestGetExecNodeConfigWithCri/isolated-containers-without-job-resources/test.canondata b/...ata/TestGetExecNodeConfigWithCri/isolated-containers-without-job-resources/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/...canondata/TestGetExecNodeConfigWithCri/single-container-with-job-resources/test.canondata b/...canondata/TestGetExecNodeConfigWithCri/single-container-with-job-resources/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/...ondata/TestGetExecNodeConfigWithCri/single-container-without-job-resources/test.canondata b/...ondata/TestGetExecNodeConfigWithCri/single-container-without-job-resources/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetExecNodeWithoutYtsaurusConfig/test.canondata b/pkg/ytconfig/canondata/TestGetExecNodeWithoutYtsaurusConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%false;
         "enable_ipv6"=%true;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetHTTPProxyConfig/test.canondata b/pkg/ytconfig/canondata/TestGetHTTPProxyConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetMasterCachesConfig/test.canondata b/pkg/ytconfig/canondata/TestGetMasterCachesConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetMasterCachesWithFixedHostsConfig/test.canondata b/pkg/ytconfig/canondata/TestGetMasterCachesWithFixedHostsConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetMasterConfig/test.canondata b/pkg/ytconfig/canondata/TestGetMasterConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetMasterWithFixedHostsConfig/test.canondata b/pkg/ytconfig/canondata/TestGetMasterWithFixedHostsConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%false;
         "enable_ipv6"=%true;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetNativeClientConfig/test.canondata b/pkg/ytconfig/canondata/TestGetNativeClientConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetQueryTrackerConfig/test.canondata b/pkg/ytconfig/canondata/TestGetQueryTrackerConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetQueueAgentConfig/test.canondata b/pkg/ytconfig/canondata/TestGetQueueAgentConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetRPCProxyConfig/test.canondata b/pkg/ytconfig/canondata/TestGetRPCProxyConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetRPCProxyWithoutOauthConfig/test.canondata b/pkg/ytconfig/canondata/TestGetRPCProxyWithoutOauthConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%false;
         "enable_ipv6"=%true;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetSchedulerConfig/test.canondata b/pkg/ytconfig/canondata/TestGetSchedulerConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetSchedulerWithFixedMasterHostsConfig/test.canondata b/pkg/ytconfig/canondata/TestGetSchedulerWithFixedMasterHostsConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%false;
         "enable_ipv6"=%true;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetStrawberryControllerConfig/test.canondata b/pkg/ytconfig/canondata/TestGetStrawberryControllerConfig/test.canondata
@@ -11,7 +11,9 @@
         chyt={
             "address_resolver"={
                 "enable_ipv4"=%true;
-                "enable_ipv6"=%true;
+                "enable_ipv6"=%false;
+                "keep_socket"=%true;
+                "force_tcp"=%false;
                 retries=1000;
             };
         };

diff --git a/pkg/ytconfig/canondata/TestGetTCPProxyConfig/test.canondata b/pkg/ytconfig/canondata/TestGetTCPProxyConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetTabletNodeConfig/test.canondata b/pkg/ytconfig/canondata/TestGetTabletNodeConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetTabletNodeWithoutYtsaurusConfig/test.canondata b/pkg/ytconfig/canondata/TestGetTabletNodeWithoutYtsaurusConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%false;
         "enable_ipv6"=%true;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/canondata/TestGetYQLAgentConfig/test.canondata b/pkg/ytconfig/canondata/TestGetYQLAgentConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     "solomon_exporter"={

diff --git a/pkg/ytconfig/chyt.go b/pkg/ytconfig/chyt.go
@@ -27,7 +27,18 @@ type ChytInitCluster struct {
 	Families       []string `yson:"families"`
 }
 
-func getStrawberryController() StrawberryController {
+type ChytConfig struct {
+	AddressResolver AddressResolver `yson:"address_resolver"`
+}
+
+func getStrawberryController(resolver *AddressResolver) StrawberryController {
+	chytConfig := ChytConfig{
+		AddressResolver: *resolver,
+	}
+	chytYsonConfig, err := marshallYsonConfig(chytConfig)
+	if err != nil {
+		chytYsonConfig = yson.RawValue("{address_resolver={enable_ipv4=%true;enable_ipv6=%true;retries=1000}}")
+	}
 	return StrawberryController{
 		Strawberry: Strawberry{
 			Root:  "//sys/strawberry",
@@ -36,7 +47,7 @@ func getStrawberryController() StrawberryController {
 			RobotUsername: consts.StrawberryControllerUserName,
 		},
 		Controllers: map[string]yson.RawValue{
-			"chyt": yson.RawValue("{address_resolver={enable_ipv4=%true;enable_ipv6=%true;retries=1000}}"),
+			"chyt": chytYsonConfig,
 		},
 		HTTPAPIEndpoint: fmt.Sprintf(":%v", consts.StrawberryHTTPAPIPort),
 	}

diff --git a/pkg/ytconfig/common.go b/pkg/ytconfig/common.go
@@ -51,6 +51,8 @@ type ClusterConnection struct {
 type AddressResolver struct {
 	EnableIPv4 bool `yson:"enable_ipv4"`
 	EnableIPv6 bool `yson:"enable_ipv6"`
+	KeepSocket bool `yson:"keep_socket"`
+	ForceTcp   bool `yson:"force_tcp"`
 	Retries    *int `yson:"retries,omitempty"`
 
 	LocalhostNameOverride *string `yson:"localhost_name_override,omitempty"`