Skip to content

Conversation

@codelipenghui
Copy link
Contributor

No description provided.

@BewareMyPower
Copy link
Contributor

The C++ client build error is caused by the cherry-pick of #9533. It should be based on #9498 first.

I have reverted the cherry-pick and cherry-picked #9498 and #9533 in order, and now it should work. /cc @codelipenghui @gaoran10

BTW, current branch-2.7 cannot be built with Python 3.9 unless cherry-picking #9389, #9574 and #13193 but we need to fix conflicts caused by some cherry-pick order. So I didn't do that.

And I'm wondering why the my commits don't contain (cherry picked from commit <commit-id>). I just did

git checkout branch-2.7
git cherry-pick <commit-id>
git push origin branch-2.7

Is there any wrong behavior?

@BewareMyPower
Copy link
Contributor

#9607 also needs to be cherry-picked. But I encountered a conflict in pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionTlsTest.java.

Please help resolve the conflict since I didn't have much context about why line 131 in following code was removed.

  130 <<<<<<< HEAD
  131         when(functionsWorkerService.getBrokerAdmin()).thenReturn(admin);
  132         Set<String> admins = Sets.newHashSet("superUser");
  133 =======
  134         Set<String> admins = Sets.newHashSet("superUser", "admin");
  135 >>>>>>> 2e0876612c7... Fix expired tls certs for cpp tests (#9607)

@BewareMyPower
Copy link
Contributor

It looks like #8560 caused the conflict, see here.

@codelipenghui codelipenghui force-pushed the penghui/bump-2.7.5-SNAPSHOT branch 2 times, most recently from 16d9d20 to 14b8a20 Compare December 12, 2021 04:38
@codelipenghui codelipenghui self-assigned this Dec 12, 2021
@codelipenghui
Copy link
Contributor Author

/pulsarbot run-failure-checks

@codelipenghui codelipenghui force-pushed the penghui/bump-2.7.5-SNAPSHOT branch from 14b8a20 to 4655afe Compare December 12, 2021 05:57
@codelipenghui codelipenghui force-pushed the penghui/bump-2.7.5-SNAPSHOT branch from 3f86469 to 59a0105 Compare December 12, 2021 10:27
Comment on lines +249 to +251
if (!globalZkCache().exists(path(POLICIES, property))) {
throw new KeeperException.NoNodeException();
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix the issue introduced by #10594, and 2.7.3 also have this problem.

@codelipenghui
Copy link
Contributor Author

/pulsarbot run-failure-checks

@apache apache deleted a comment from mattisonchao Dec 15, 2021
@apache apache deleted a comment from mattisonchao Dec 15, 2021
@apache apache deleted a comment from mattisonchao Dec 15, 2021
@apache apache deleted a comment from mattisonchao Dec 15, 2021
@apache apache deleted a comment from mattisonchao Dec 15, 2021
@apache apache deleted a comment from mattisonchao Dec 15, 2021
@Technoboy-
Copy link
Contributor

We use apache/pulsar#13299 to track the flaky test and move your before comments to there. @mattisonchao .

…okeTest.

PrometheusMetricsTest#testAuthMetrics, SubscriptionSeekTest#testSeekForBatchMessageAndSpecifiedBatchIndex.
PeerReplicatorTest#testPeerClusterTopicLookup, NonPersistentTopicE2ETest#testGCWillDeleteSchema.
PersistentTopicsTest#testPeekWithSubscriptionNameNotExist, PulsarStateTest#testSinkState.
…erIfFullTest#testCurrentLedgerRolloverIfFull

ManagedLedgerCompressionTest#testRestartBrokerEnableManagedLedgerInfoCompression
…iReaderReachEndOfTopicOnMessageWithBatches.

PersistentDispatcherFailoverConsumerTest#testAddRemoveConsumer, testAddRemoveConsumerNonPartitionedTopic
…cReaderTest#testMultiReaderBuilderConcurrentCreate

PulsarOffsetBackingStoreTest
@codelipenghui codelipenghui changed the title [Don't merge] Bump Pulsar 2.7.5-SNAPSHOT Bump Pulsar 2.7.5-SNAPSHOT and fixes tests. Dec 16, 2021
@codelipenghui codelipenghui changed the title Bump Pulsar 2.7.5-SNAPSHOT and fixes tests. [Branch-2.7] Make the unit test and integration test work Dec 17, 2021
@codelipenghui codelipenghui merged commit c643a8a into apache:branch-2.7 Dec 17, 2021
@codelipenghui codelipenghui deleted the penghui/bump-2.7.5-SNAPSHOT branch May 17, 2022 01:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants