jerrypeng commented on a change in pull request #10962: URL: https://github.com/apache/pulsar/pull/10962#discussion_r655765724
########## File path: pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiHealthCheckTest.java ########## @@ -0,0 +1,83 @@ +/** + * 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 + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.admin; + +import com.google.common.collect.Sets; +import lombok.extern.slf4j.Slf4j; +import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest; +import org.apache.pulsar.client.admin.PulsarAdminException; +import org.apache.pulsar.common.naming.TopicVersion; +import org.apache.pulsar.common.policies.data.ClusterData; +import org.apache.pulsar.common.policies.data.TenantInfoImpl; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import java.net.URL; + +@Test(groups = "broker") +@Slf4j +public class AdminApiHealthCheckTest extends MockedPulsarServiceBaseTest { + + @BeforeMethod + @Override + public void setup() throws Exception { + resetConfig(); + super.internalSetup(); + admin.clusters().createCluster("test", + ClusterData.builder().serviceUrl(pulsar.getWebServiceAddress()).build()); + TenantInfoImpl tenantInfo = new TenantInfoImpl( + Sets.newHashSet("role1", "role2"), Sets.newHashSet("test")); + admin.tenants().createTenant("pulsar", tenantInfo); + admin.namespaces().createNamespace("pulsar/system", Sets.newHashSet("test")); + admin.tenants().createTenant("public", tenantInfo); + admin.namespaces().createNamespace("public/default", Sets.newHashSet("test")); + } + + @AfterMethod(alwaysRun = true) + @Override + public void cleanup() throws Exception { + super.internalCleanup(); + } + + @Test + public void testHealthCheckup() throws Exception { + admin.brokers().healthcheck(); + } + + @Test + public void testHealthCheckupV1() throws Exception { + admin.brokers().healthcheck(TopicVersion.V1); + } + + @Test(expectedExceptions = PulsarAdminException.class) + public void testHealthCheckupV2Error() throws Exception { + admin.brokers().healthcheck(TopicVersion.V2); Review comment: Why does the v2 version fail but the v1 version passes without having to explicitly create the namespace the health check topic will be in? ########## File path: pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BaseResource.java ########## @@ -282,4 +282,5 @@ public static String getReasonFromServer(WebApplicationException e) { } } } + Review comment: nit unnecessary new line ########## File path: pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdConsume.java ########## @@ -414,7 +414,7 @@ private int consumeFromWebSocket(String topic) { LOG.debug("No message to consume after waiting for 5 seconds."); } else { try { - System.out.println(Base64.getDecoder().decode(msg)); + System.out.println(Arrays.toString(Base64.getDecoder().decode(msg))); Review comment: why are making this change? ########## File path: pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiHealthCheckTest.java ########## @@ -0,0 +1,83 @@ +/** + * 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 + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.admin; + +import com.google.common.collect.Sets; +import lombok.extern.slf4j.Slf4j; +import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest; +import org.apache.pulsar.client.admin.PulsarAdminException; +import org.apache.pulsar.common.naming.TopicVersion; +import org.apache.pulsar.common.policies.data.ClusterData; +import org.apache.pulsar.common.policies.data.TenantInfoImpl; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import java.net.URL; + +@Test(groups = "broker") +@Slf4j +public class AdminApiHealthCheckTest extends MockedPulsarServiceBaseTest { + + @BeforeMethod + @Override + public void setup() throws Exception { + resetConfig(); + super.internalSetup(); + admin.clusters().createCluster("test", + ClusterData.builder().serviceUrl(pulsar.getWebServiceAddress()).build()); + TenantInfoImpl tenantInfo = new TenantInfoImpl( + Sets.newHashSet("role1", "role2"), Sets.newHashSet("test")); + admin.tenants().createTenant("pulsar", tenantInfo); + admin.namespaces().createNamespace("pulsar/system", Sets.newHashSet("test")); + admin.tenants().createTenant("public", tenantInfo); + admin.namespaces().createNamespace("public/default", Sets.newHashSet("test")); + } + + @AfterMethod(alwaysRun = true) + @Override + public void cleanup() throws Exception { + super.internalCleanup(); + } + + @Test + public void testHealthCheckup() throws Exception { + admin.brokers().healthcheck(); + } + + @Test + public void testHealthCheckupV1() throws Exception { + admin.brokers().healthcheck(TopicVersion.V1); + } + + @Test(expectedExceptions = PulsarAdminException.class) + public void testHealthCheckupV2Error() throws Exception { + admin.brokers().healthcheck(TopicVersion.V2); Review comment: where are we creating that? ########## File path: pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiHealthCheckTest.java ########## @@ -0,0 +1,83 @@ +/** + * 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 + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pulsar.broker.admin; + +import com.google.common.collect.Sets; +import lombok.extern.slf4j.Slf4j; +import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest; +import org.apache.pulsar.client.admin.PulsarAdminException; +import org.apache.pulsar.common.naming.TopicVersion; +import org.apache.pulsar.common.policies.data.ClusterData; +import org.apache.pulsar.common.policies.data.TenantInfoImpl; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import java.net.URL; + +@Test(groups = "broker") +@Slf4j +public class AdminApiHealthCheckTest extends MockedPulsarServiceBaseTest { + + @BeforeMethod + @Override + public void setup() throws Exception { + resetConfig(); + super.internalSetup(); + admin.clusters().createCluster("test", + ClusterData.builder().serviceUrl(pulsar.getWebServiceAddress()).build()); + TenantInfoImpl tenantInfo = new TenantInfoImpl( + Sets.newHashSet("role1", "role2"), Sets.newHashSet("test")); + admin.tenants().createTenant("pulsar", tenantInfo); + admin.namespaces().createNamespace("pulsar/system", Sets.newHashSet("test")); + admin.tenants().createTenant("public", tenantInfo); + admin.namespaces().createNamespace("public/default", Sets.newHashSet("test")); + } + + @AfterMethod(alwaysRun = true) + @Override + public void cleanup() throws Exception { + super.internalCleanup(); + } + + @Test + public void testHealthCheckup() throws Exception { + admin.brokers().healthcheck(); + } + + @Test + public void testHealthCheckupV1() throws Exception { + admin.brokers().healthcheck(TopicVersion.V1); + } + + @Test(expectedExceptions = PulsarAdminException.class) + public void testHealthCheckupV2Error() throws Exception { + admin.brokers().healthcheck(TopicVersion.V2); Review comment: The namespace for v2 health check topic should automatically be created. It is unreasonable to ask a user to manually create the ns of the health check topic. ########## File path: pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java ########## @@ -142,6 +142,7 @@ public static final Pattern HEARTBEAT_NAMESPACE_PATTERN = Pattern.compile("pulsar/[^/]+/([^:]+:\\d+)"); public static final Pattern SLA_NAMESPACE_PATTERN = Pattern.compile(SLA_NAMESPACE_PROPERTY + "/[^/]+/([^:]+:\\d+)"); public static final String HEARTBEAT_NAMESPACE_FMT = "pulsar/%s/%s:%s"; + public static final String HEARTBEAT_NAMESPACE_FMT_V2 = "pulsar/%s:%s"; Review comment: You also need to update the static variable `HEARTBEAT_NAMESPACE_PATTERN` and the method `checkHeartbeatNamespace` to support v2 version of the topic ########## File path: pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java ########## @@ -142,6 +142,7 @@ public static final Pattern HEARTBEAT_NAMESPACE_PATTERN = Pattern.compile("pulsar/[^/]+/([^:]+:\\d+)"); public static final Pattern SLA_NAMESPACE_PATTERN = Pattern.compile(SLA_NAMESPACE_PROPERTY + "/[^/]+/([^:]+:\\d+)"); public static final String HEARTBEAT_NAMESPACE_FMT = "pulsar/%s/%s:%s"; + public static final String HEARTBEAT_NAMESPACE_FMT_V2 = "pulsar/%s:%s"; Review comment: @aahmed-se I am talking about `checkHeartbeatNamespace` not `getHeartbeatNamespace` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
