Uploaded image for project: 'MariaDB Server'
  1. MariaDB Server
  2. MDEV-35350

Consolidate MTR wait_for_pattern_in_file.inc and SEARCH_WAIT in search_pattern_in_file.inc

Details

    • Task
    • Status: Closed (View Workflow)
    • Blocker
    • Resolution: Fixed
    • 10.5.28
    • Tests
    • None

    Description

      There are two scripts in MTR which do the same thing:

      1) wait_for_pattern_in_file.inc (added by MDEV-33551 in 10.6),
      2) The SEARCH_WAIT parameter to search_pattern_in_file.inc (added by MDEV-34753 in 10.11).

      These scripts should be consolidated into one place, and also backported to 10.5 for more available usage and easier future merges.

      I think the SEARCH_WAIT parameter should be preferred, so everything about finding a pattern in a file is consolidated into one place. Note this option likely has to be slightly extended as well to account for MDEV-35109.

      Attachments

        Activity

          Ascending order - Click to sort in descending order
          bnestere Brandon Nesterenko added a comment -

          Made this a blocker, as it is needed to resolve a merge from 10.6 to 10.11 for MDEV-35109.

          bnestere Brandon Nesterenko added a comment - Made this a blocker, as it is needed to resolve a merge from 10.6 to 10.11 for MDEV-35109 .
          bnestere Brandon Nesterenko added a comment -

          Hi Kristian,

          Just wanted to give you an opportunity to double check my additional fixes to SEARCH_WAIT in search_pattern_in_file.inc to allow for some particular number of matches.

          See the last commit in PR 3612 (the first commit takes search_pattern_in_file.inc from 10.11 as-is).

          bnestere Brandon Nesterenko added a comment - Hi Kristian, Just wanted to give you an opportunity to double check my additional fixes to SEARCH_WAIT in search_pattern_in_file.inc to allow for some particular number of matches. See the last commit in PR 3612 (the first commit takes search_pattern_in_file.inc from 10.11 as-is).
          knielsen Kristian Nielsen added a comment -

          One comment on the "FOUND n" matching.

          knielsen Kristian Nielsen added a comment - One comment on the "FOUND n" matching.
          bnestere Brandon Nesterenko added a comment -

          Pushed into 10.5 as 155a82e0b16

          bnestere Brandon Nesterenko added a comment - Pushed into 10.5 as 155a82e0b16

          People

            bnestere Brandon Nesterenko
            bnestere Brandon Nesterenko
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved:

              Git Integration

                Error rendering 'com.xiplink.jira.git.jira_git_plugin:git-issue-webpanel'. Please contact your Jira administrators.