Repository: kudu Updated Branches: refs/heads/master 758cf8b8d -> 981c5e1ab
log block manager: adjust list of buggy el6 kernels Red Hat has published the el6.8 kernel update [1] which fixes KUDU-1508. The version is slightly newer than the version listed in their bug report [2]; my guess is that no kernels in between were actually released. In any case, this patch adjusts our version detection accordingly. 1. https://rhn.redhat.com/errata/RHSA-2017-0307.html 2. https://bugzilla.redhat.com/show_bug.cgi?id=1397808 Change-Id: Id8dddca986207df1ec857b7be32440c1847e3d59 Reviewed-on: http://gerrit.cloudera.org:8080/6143 Tested-by: Adar Dembo <[email protected]> Reviewed-by: Todd Lipcon <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/981c5e1a Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/981c5e1a Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/981c5e1a Branch: refs/heads/master Commit: 981c5e1abeb6b02b69dc291781c10d5571af464d Parents: 758cf8b Author: Adar Dembo <[email protected]> Authored: Fri Feb 24 12:13:25 2017 -0800 Committer: Adar Dembo <[email protected]> Committed: Sat Feb 25 02:55:24 2017 +0000 ---------------------------------------------------------------------- src/kudu/fs/block_manager-test.cc | 5 +++-- src/kudu/fs/log_block_manager.cc | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/981c5e1a/src/kudu/fs/block_manager-test.cc ---------------------------------------------------------------------- diff --git a/src/kudu/fs/block_manager-test.cc b/src/kudu/fs/block_manager-test.cc index 425cd05..a58f27f 100644 --- a/src/kudu/fs/block_manager-test.cc +++ b/src/kudu/fs/block_manager-test.cc @@ -1338,10 +1338,11 @@ TEST_F(LogBlockManagerTest, TestParseKernelRelease) { // Kernels from el6.8 update stream before a fix was applied: buggy. ASSERT_TRUE(LogBlockManager::IsBuggyEl6Kernel("2.6.32-642.11.1.el6.x86_64")); + ASSERT_TRUE(LogBlockManager::IsBuggyEl6Kernel("2.6.32-642.14.1.el6.x86_64")); + ASSERT_TRUE(LogBlockManager::IsBuggyEl6Kernel("2.6.32-642.14.2.el6.x86_64")); // Kernels from el6.8 update stream after a fix was applied: not buggy. - ASSERT_FALSE(LogBlockManager::IsBuggyEl6Kernel("2.6.32-642.14.1.el6.x86_64")); - ASSERT_FALSE(LogBlockManager::IsBuggyEl6Kernel("2.6.32-642.14.2.el6.x86_64")); + ASSERT_FALSE(LogBlockManager::IsBuggyEl6Kernel("2.6.32-642.15.1.el6.x86_64")); ASSERT_FALSE(LogBlockManager::IsBuggyEl6Kernel("2.6.32-642.18.1.el6.x86_64")); // Kernel from el6.9 development prior to fix: buggy. http://git-wip-us.apache.org/repos/asf/kudu/blob/981c5e1a/src/kudu/fs/log_block_manager.cc ---------------------------------------------------------------------- diff --git a/src/kudu/fs/log_block_manager.cc b/src/kudu/fs/log_block_manager.cc index f1d76b1..22eb08d 100644 --- a/src/kudu/fs/log_block_manager.cc +++ b/src/kudu/fs/log_block_manager.cc @@ -1786,9 +1786,11 @@ bool LogBlockManager::IsBuggyEl6Kernel(const string& kernel_release) { if (kernel_release.find("el6") == string::npos) return false; // Kernels in the 6.8 update stream (2.6.32-642.a.b) are fixed - // for a >= 14. + // for a >= 15. + // + // https://rhn.redhat.com/errata/RHSA-2017-0307.html if (MatchPattern(kernel_release, "2.6.32-642.*.el6.*") && - lt("2.6.32-642.14.0", kernel_release)) { + lt("2.6.32-642.15.0", kernel_release)) { return false; }
