Skip to content

Sync upstream AK 2.4 -> CCS 2.4 - 1 oct 2020 #415

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

Merged
Srini Dandu (sdandu-gh) merged 2 commits into from
Oct 1, 2020
Merged

Sync upstream AK 2.4 -> CCS 2.4 - 1 oct 2020 #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63f3e1c
Backport Jenkinsfile to 2.4 branch (#9329)
mumrah Oct 1, 2020
5f82bb7
Merge remote-tracking branch 'upstream/2.4' into sync_upstream_2.4_1_…
Oct 1, 2020
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
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ subprojects {

test {
maxParallelForks = userMaxForks ?: Runtime.runtime.availableProcessors()
ignoreFailures = userIgnoreFailures

minHeapSize = "256m"
maxHeapSize = "2048m"
Expand Down
12 changes: 8 additions & 4 deletions core/src/test/scala/unit/kafka/coordinator/group/GroupMetadataManagerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import org.apache.kafka.common.requests.ProduceResponse.PartitionResponse
import org.apache.kafka.common.utils.Utils
import org.apache.kafka.common.KafkaException
import org.easymock.{Capture, EasyMock, IAnswer}
import org.junit.Assert.{assertEquals, assertFalse, assertNull, assertTrue, assertThrows}
import org.junit.Assert.{assertEquals, assertFalse, assertNull, assertTrue}
import org.junit.{Before, Test}
import org.scalatest.Assertions.fail

Expand Down Expand Up @@ -912,9 +912,13 @@ class GroupMetadataManagerTest {
// reset the position to the starting position 0 so that it can read the data in correct order
groupMetadataRecordValue.position(0)

val e = assertThrows(classOf[KafkaException],
() => GroupMetadataManager.readGroupMessageValue(groupId, groupMetadataRecordValue, time))
assertEquals(s"Unknown group metadata version ${unsupportedVersion}", e.getMessage)
try {
GroupMetadataManager.readGroupMessageValue(groupId, groupMetadataRecordValue, time)
fail("Expected KafkaException here")
} catch {
case e: KafkaException => assertEquals(s"Unknown group metadata version ${unsupportedVersion}", e.getMessage)
case _ => fail("Expected KafkaException here")
}
}

@Test
Expand Down