Cherry-pick Fixes for apache#22163 and apache#22184

datastax · Mar 11, 2024 · 4062015 · 4062015
1 parent 3e3d958
commit 4062015
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesAuthZTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesAuthZTest.java
@@ -1,4 +1,4 @@
-/*
+/**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

diff --git a/...functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/SinksImpl.java b/...functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/SinksImpl.java
@@ -398,7 +398,7 @@ private void setTransformFunctionPackageLocation(Function.FunctionMetaData.Build
         try {
             String builtin = functionDetails.getBuiltin();
             if (isBlank(builtin)) {
-                functionPackageFile = getPackageFile(transformFunction);
+                functionPackageFile = getPackageFile(componentType, transformFunction);
             }
             Function.PackageLocationMetaData.Builder functionPackageLocation =
                     getFunctionPackageLocation(functionMetaDataBuilder.build(),
@@ -716,7 +716,7 @@ private Function.FunctionDetails validateUpdateRequestParams(final String tenant
                 transformFunctionPackage =
                         getBuiltinFunctionPackage(sinkConfig.getTransformFunction());
                 if (transformFunctionPackage == null) {
-                    File functionPackageFile = getPackageFile(sinkConfig.getTransformFunction());
+                    File functionPackageFile = getPackageFile(componentType, sinkConfig.getTransformFunction());
                     transformFunctionPackage =
                             new FunctionFilePackage(functionPackageFile, workerConfig.getNarExtractionDirectory(),
                                     workerConfig.getEnableClassloadingOfExternalFiles(), ConnectorDefinition.class);

diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConfiguration.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConfiguration.java
@@ -361,12 +361,6 @@ public class ProxyConfiguration implements PulsarConfiguration {
     )
     private boolean enableProxyStatsEndpoints = true;
 
-    @FieldContext(
-        category = CATEGORY_HTTP,
-        doc = "Whether to enable the proxy's /metrics, /proxy-stats, and /status.html http endpoints"
-    )
-    private boolean enableProxyStatsEndpoints = true;
-
     @FieldContext(
         category = CATEGORY_AUTHENTICATION,
         doc = "Whether the '/metrics' endpoint requires authentication. Defaults to true."