temp

Author: infvg

presto-main-base/src/main/java/com/facebook/presto/execution/resourceGroups/ResourceGroupRuntimeInfo.java

@@ -17,6 +17,8 @@
 import com.facebook.drift.annotations.ThriftField;
 import com.facebook.drift.annotations.ThriftStruct;
 import com.facebook.presto.spi.resourceGroups.ResourceGroupId;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.Optional;
 
@@ -35,7 +37,14 @@ public class ResourceGroupRuntimeInfo
     private final Optional<ResourceGroupSpecInfo> resourceGroupConfigSpec;
 
     @ThriftConstructor
-    public ResourceGroupRuntimeInfo(ResourceGroupId resourceGroupId, long memoryUsageBytes, int queuedQueries, int descendantQueuedQueries, int runningQueries, int descendantRunningQueries, Optional<ResourceGroupSpecInfo> resourceGroupConfigSpec)
+    @JsonCreator
+    public ResourceGroupRuntimeInfo(@JsonProperty("resourceGroupId") ResourceGroupId resourceGroupId,
+                                    @JsonProperty("memoryUsageBytes") long memoryUsageBytes,
+                                    @JsonProperty("queuedQueries") int queuedQueries,
+                                    @JsonProperty("descendantQueuedQueries") int descendantQueuedQueries,
+                                    @JsonProperty("runningQueries") int runningQueries,
+                                    @JsonProperty("descendantRunningQueries") int descendantRunningQueries,
+                                    @JsonProperty("resourceGroupConfigSpec") Optional<ResourceGroupSpecInfo> resourceGroupConfigSpec)
     {
         this.resourceGroupId = requireNonNull(resourceGroupId, "resourceGroupId is null");
         this.memoryUsageBytes = memoryUsageBytes;
@@ -52,42 +61,49 @@ public static Builder builder(ResourceGroupId resourceGroupId)
     }
 
     @ThriftField(1)
+    @JsonProperty
     public ResourceGroupId getResourceGroupId()
     {
         return resourceGroupId;
     }
 
     @ThriftField(2)
+    @JsonProperty
     public long getMemoryUsageBytes()
     {
         return memoryUsageBytes;
     }
 
     @ThriftField(3)
+    @JsonProperty
     public int getQueuedQueries()
     {
         return queuedQueries;
     }
 
     @ThriftField(4)
+    @JsonProperty
     public int getDescendantQueuedQueries()
     {
         return descendantQueuedQueries;
     }
 
     @ThriftField(5)
+    @JsonProperty
     public int getRunningQueries()
     {
         return runningQueries;
     }
 
     @ThriftField(6)
+    @JsonProperty
     public int getDescendantRunningQueries()
     {
         return descendantRunningQueries;
     }
 
     @ThriftField(7)
+    @JsonProperty
     public Optional<ResourceGroupSpecInfo> getResourceGroupConfigSpec()
     {
         return resourceGroupConfigSpec;

presto-main-base/src/main/java/com/facebook/presto/resourcemanager/ResourceManagerConfig.java

@@ -17,6 +17,7 @@
 import com.facebook.airlift.configuration.ConfigDescription;
 import com.facebook.airlift.units.Duration;
 import com.facebook.airlift.units.MinDuration;
+import com.facebook.presto.server.InternalCommunicationConfig;
 import jakarta.validation.constraints.Min;
 
 import java.util.concurrent.TimeUnit;
@@ -42,7 +43,9 @@ public class ResourceManagerConfig
     private Duration memoryPoolFetchInterval = new Duration(1, SECONDS);
     private boolean resourceGroupServiceCacheEnabled;
     private Duration resourceGroupServiceCacheExpireInterval = new Duration(10, SECONDS);
-    private boolean heartbeatHttpEnabled;
+    private boolean httpServerEnabled;
+
+    private InternalCommunicationConfig.CommunicationProtocol communicationProtocol = InternalCommunicationConfig.CommunicationProtocol.THRIFT;
     private Duration resourceGroupServiceCacheRefreshInterval = new Duration(1, SECONDS);
 
     private Duration runningTaskCountFetchInterval = new Duration(1, SECONDS);
@@ -279,15 +282,29 @@ public ResourceManagerConfig setRunningTaskCountFetchInterval(Duration runningTa
         return this;
     }
 
-    public boolean getHeartbeatHttpEnabled()
+    @Config("resource-manager.http-server-enabled")
+    @ConfigDescription("Enable HTTP REST endpoints on the resource manager for internal communication.")
+    public ResourceManagerConfig setHttpServerEnabled(boolean httpEnabled)
+    {
+        this.httpServerEnabled = httpEnabled;
+        return this;
+    }
+
+    public boolean getHttpServerEnabled()
     {
-        return heartbeatHttpEnabled;
+        return httpServerEnabled;
     }
 
-    @Config("resource-manager.heartbeat-http-enabled")
-    public ResourceManagerConfig setHeartbeatHttpEnabled(boolean heartbeatHttpEnabled)
+    @Config("resource-manager.communication-protocol")
+    @ConfigDescription("Protocol for internal communication with resource managers.")
+    public ResourceManagerConfig setCommunicationProtocol(InternalCommunicationConfig.CommunicationProtocol communicationProtocol)
     {
-        this.heartbeatHttpEnabled = heartbeatHttpEnabled;
+        this.communicationProtocol = communicationProtocol;
         return this;
     }
+
+    public InternalCommunicationConfig.CommunicationProtocol getCommunicationProtocol()
+    {
+        return communicationProtocol;
+    }
 }

presto-main-base/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerClusterStateProvider.java

@@ -724,7 +724,7 @@ private void assertMemoryPoolMap(ResourceManagerClusterStateProvider provider, i
         assertEquals(clusterMemoryPoolInfo.getLargestMemoryQuery().map(QueryId::getId), largestMemoryQuery);
     }
 
-    private static BasicQueryInfo createQueryInfo(String queryId, QueryState state)
+    public static BasicQueryInfo createQueryInfo(String queryId, QueryState state)
     {
         return createQueryInfo(queryId, state, "global", GENERAL_POOL);
     }

presto-main-base/src/test/java/com/facebook/presto/resourcemanager/TestResourceManagerConfig.java

@@ -15,6 +15,7 @@
 
 import com.facebook.airlift.configuration.testing.ConfigAssertions;
 import com.facebook.airlift.units.Duration;
+import com.facebook.presto.server.InternalCommunicationConfig;
 import com.google.common.collect.ImmutableMap;
 import org.testng.annotations.Test;
 
@@ -50,7 +51,8 @@ public void testDefaults()
                 .setResourceGroupRuntimeHeartbeatInterval(new Duration(1, SECONDS))
                 .setRunningTaskCountFetchInterval(new Duration(1, SECONDS))
                 .setResourceGroupRuntimeInfoTimeout(new Duration(30, SECONDS))
-                .setHeartbeatHttpEnabled(false));
+                .setHttpServerEnabled(false)
+                .setCommunicationProtocol(InternalCommunicationConfig.CommunicationProtocol.THRIFT));
     }
 
     @Test
@@ -75,7 +77,8 @@ public void testExplicitPropertyMappings()
                 .put("resource-manager.resource-group-runtimeinfo-heartbeat-interval", "6m")
                 .put("resource-manager.running-task-count-fetch-interval", "1m")
                 .put("resource-manager.resource-group-runtimeinfo-timeout", "4s")
-                .put("resource-manager.heartbeat-http-enabled", "true")
+                .put("resource-manager.http-server-enabled", "true")
+                .put("resource-manager.communication-protocol", "HTTP")
                 .build();
 
         ResourceManagerConfig expected = new ResourceManagerConfig()
@@ -97,7 +100,8 @@ public void testExplicitPropertyMappings()
                 .setResourceGroupRuntimeHeartbeatInterval(new Duration(6, MINUTES))
                 .setResourceGroupRuntimeInfoTimeout(new Duration(4, SECONDS))
                 .setRunningTaskCountFetchInterval(new Duration(1, MINUTES))
-                .setHeartbeatHttpEnabled(true);
+                .setHttpServerEnabled(true)
+                .setCommunicationProtocol(InternalCommunicationConfig.CommunicationProtocol.HTTP);
 
         assertFullMapping(properties, expected);
     }

presto-main/etc/catalog/hive.properties

@@ -6,4 +6,4 @@
 #
 
 connector.name=hive-hadoop2
-hive.metastore.uri=thrift://localhost:9083
+hive.metastore.uri=thrift://localhost:9083