Skip to content

Commit 4062015

Browse files
committed
Cherry-pick Fixes for apache#22163 and apache#22184
1 parent 3e3d958 commit 4062015

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicPoliciesAuthZTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/**
22
* Licensed to the Apache Software Foundation (ASF) under one
33
* or more contributor license agreements. See the NOTICE file
44
* distributed with this work for additional information

pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/SinksImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ private void setTransformFunctionPackageLocation(Function.FunctionMetaData.Build
398398
try {
399399
String builtin = functionDetails.getBuiltin();
400400
if (isBlank(builtin)) {
401-
functionPackageFile = getPackageFile(transformFunction);
401+
functionPackageFile = getPackageFile(componentType, transformFunction);
402402
}
403403
Function.PackageLocationMetaData.Builder functionPackageLocation =
404404
getFunctionPackageLocation(functionMetaDataBuilder.build(),
@@ -716,7 +716,7 @@ private Function.FunctionDetails validateUpdateRequestParams(final String tenant
716716
transformFunctionPackage =
717717
getBuiltinFunctionPackage(sinkConfig.getTransformFunction());
718718
if (transformFunctionPackage == null) {
719-
File functionPackageFile = getPackageFile(sinkConfig.getTransformFunction());
719+
File functionPackageFile = getPackageFile(componentType, sinkConfig.getTransformFunction());
720720
transformFunctionPackage =
721721
new FunctionFilePackage(functionPackageFile, workerConfig.getNarExtractionDirectory(),
722722
workerConfig.getEnableClassloadingOfExternalFiles(), ConnectorDefinition.class);

pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConfiguration.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -361,12 +361,6 @@ public class ProxyConfiguration implements PulsarConfiguration {
361361
)
362362
private boolean enableProxyStatsEndpoints = true;
363363

364-
@FieldContext(
365-
category = CATEGORY_HTTP,
366-
doc = "Whether to enable the proxy's /metrics, /proxy-stats, and /status.html http endpoints"
367-
)
368-
private boolean enableProxyStatsEndpoints = true;
369-
370364
@FieldContext(
371365
category = CATEGORY_AUTHENTICATION,
372366
doc = "Whether the '/metrics' endpoint requires authentication. Defaults to true."

0 commit comments

Comments
 (0)