Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix] [broker] fix typo and useless local variable. #22704

Merged
merged 3 commits into from
May 14, 2024
Merged

[fix] [broker] fix typo and useless local variable. #22704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a38c0c9
fix.
thetumbled May 10, 2024
72c1332
fix typo.
thetumbled May 10, 2024
82f7eae
Merge remote-tracking branch 'apache/master' into Fix_Typo
thetumbled May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions ...n/java/org/apache/pulsar/broker/service/persistent/ReplicatedSubscriptionsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@ public ReplicatedSubscriptionsController(PersistentTopic topic, String localClus
}

public void receivedReplicatedSubscriptionMarker(Position position, int markerType, ByteBuf payload) {
MarkerType m = null;

try {
switch (markerType) {
case MarkerType.REPLICATED_SUBSCRIPTION_SNAPSHOT_REQUEST_VALUE:
Expand All @@ -105,7 +103,6 @@ public void receivedReplicatedSubscriptionMarker(Position position, int markerTy
default:
// Ignore
}

} catch (IOException e) {
log.warn("[{}] Failed to parse marker: {}", topic.getName(), e);
}
Expand Down Expand Up @@ -191,7 +188,7 @@ private void receiveSubscriptionUpdated(ReplicatedSubscriptionsUpdate update) {
if (sub != null) {
sub.acknowledgeMessage(Collections.singletonList(pos), AckType.Cumulative, Collections.emptyMap());
} else {
// Subscription doesn't exist. We need to force the creation of the subscription in this cluster, because
// Subscription doesn't exist. We need to force the creation of the subscription in this cluster.
log.info("[{}][{}] Creating subscription at {}:{} after receiving update from replicated subscription",
topic, update.getSubscriptionName(), updatedMessageId.getLedgerId(), pos);
topic.createSubscription(update.getSubscriptionName(), InitialPosition.Earliest,
Expand Down
4 changes: 2 additions & 2 deletions ...r/service/ReplicatorSubscriptionTest.java → ...r/service/ReplicatedSubscriptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
* Tests replicated subscriptions (PIP-33)
*/
@Test(groups = "broker")
public class ReplicatorSubscriptionTest extends ReplicatorTestBase {
private static final Logger log = LoggerFactory.getLogger(ReplicatorSubscriptionTest.class);
public class ReplicatedSubscriptionTest extends ReplicatorTestBase {
private static final Logger log = LoggerFactory.getLogger(ReplicatedSubscriptionTest.class);

@Override
@BeforeClass(timeOut = 300000)
Expand Down
2 changes: 1 addition & 1 deletion ...catorSubscriptionWithTransactionTest.java → ...catedSubscriptionWithTransactionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* Tests replicated subscriptions with transaction (PIP-33)
*/
@Test(groups = "broker")
public class ReplicatorSubscriptionWithTransactionTest extends ReplicatorSubscriptionTest {
public class ReplicatedSubscriptionWithTransactionTest extends ReplicatedSubscriptionTest {

@Override
@BeforeClass(timeOut = 300000)
Expand Down
Loading