Skip to content

fix: pfc timer accuracy timestamp regex#16757

Merged
yejianquan merged 1 commit intosonic-net:masterfrom
auspham:austinpham/31202914-fix-pfc-timestamp-regex
Feb 3, 2025
Merged

fix: pfc timer accuracy timestamp regex#16757
yejianquan merged 1 commit intosonic-net:masterfrom
auspham:austinpham/31202914-fix-pfc-timestamp-regex

Conversation

@auspham
Copy link
Copy Markdown
Contributor

@auspham auspham commented Feb 2, 2025

Description of PR

Summary:
Fixes # (issue) 31202914

From #16446 we are changing to use regex to capture the timestamp for pfc timer accuracy. However, the regex does not cover the scenario where date digit is 1. For example: 2025 Jan 5 00:53:14.103188

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • New Test case
    • Skipped for non-supported platforms
  • Test case improvement

Back port request

  • 202012
  • 202205
  • 202305
  • 202311
  • 202405
  • 202411

Approach

What is the motivation for this PR?

Comparing between:

  • 2025 Jan 26 17:36:31.27789
  • 2025 Feb 2 15:17:24.055182

We can see that we might need up to 2 spaces after month and the number of day digits can vary between 1 to 2.

How did you do it?

Adjust the regex so it matches for both format

How did you verify/test it?

image

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

Signed-off-by: Austin Pham <austinpham@microsoft.com>
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Copy Markdown
Collaborator

@yejianquan yejianquan left a comment

Choose a reason for hiding this comment

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

LGTM

@yejianquan yejianquan merged commit 769c2f6 into sonic-net:master Feb 3, 2025
mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Feb 3, 2025
Description of PR
Summary:
Fixes # (issue) 31202914

From sonic-net#16446 we are changing to use regex to capture the timestamp for pfc timer accuracy. However, the regex does not cover the scenario where date digit is 1. For example: 2025 Jan  5 00:53:14.103188 

Approach
What is the motivation for this PR?
Comparing between:

2025 Jan 26 17:36:31.27789
2025 Feb  2 15:17:24.055182
We can see that we might need up to 2 spaces after month and the number of day digits can vary between 1 to 2.

How did you do it?
Adjust the regex so it matches for both format

How did you verify/test it?
image

Signed-off-by: Austin Pham <austinpham@microsoft.com>
@mssonicbld
Copy link
Copy Markdown
Collaborator

Cherry-pick PR to 202411: #16763

@mssonicbld
Copy link
Copy Markdown
Collaborator

Cherry-pick PR to msft-202405: Azure/sonic-mgmt.msft#53

@yejianquan
Copy link
Copy Markdown
Collaborator

@lipxu please suggest whether need to go to 202405 branch

mssonicbld pushed a commit that referenced this pull request Feb 3, 2025
Description of PR
Summary:
Fixes # (issue) 31202914

From #16446 we are changing to use regex to capture the timestamp for pfc timer accuracy. However, the regex does not cover the scenario where date digit is 1. For example: 2025 Jan  5 00:53:14.103188 

Approach
What is the motivation for this PR?
Comparing between:

2025 Jan 26 17:36:31.27789
2025 Feb  2 15:17:24.055182
We can see that we might need up to 2 spaces after month and the number of day digits can vary between 1 to 2.

How did you do it?
Adjust the regex so it matches for both format

How did you verify/test it?
image

Signed-off-by: Austin Pham <austinpham@microsoft.com>
@lipxu
Copy link
Copy Markdown
Contributor

lipxu commented Feb 3, 2025

@lipxu please suggest whether need to go to 202405 branch

Thanks @yejianquan , please backport it to 202405 branch

@lipxu
Copy link
Copy Markdown
Contributor

lipxu commented Feb 10, 2025

Hi, @auspham Thanks for addressing the failure, do you think we need to modify the regex1 pattern, too?

@auspham
Copy link
Copy Markdown
Contributor Author

auspham commented Feb 10, 2025

Hi, @auspham Thanks for addressing the failure, do you think we need to modify the regex1 pattern, too?

Yes, thanks for pointing out.

@yejianquan
Copy link
Copy Markdown
Collaborator

@lipxu please suggest whether need to go to 202405 branch

Thanks @yejianquan , please backport it to 202405 branch

@bingwang-ms FYI

mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Feb 11, 2025
Description of PR
Summary:
Fixes # (issue) 31202914

From sonic-net#16446 we are changing to use regex to capture the timestamp for pfc timer accuracy. However, the regex does not cover the scenario where date digit is 1. For example: 2025 Jan  5 00:53:14.103188 

Approach
What is the motivation for this PR?
Comparing between:

2025 Jan 26 17:36:31.27789
2025 Feb  2 15:17:24.055182
We can see that we might need up to 2 spaces after month and the number of day digits can vary between 1 to 2.

How did you do it?
Adjust the regex so it matches for both format

How did you verify/test it?
image

Signed-off-by: Austin Pham <austinpham@microsoft.com>
@bingwang-ms
Copy link
Copy Markdown
Collaborator

Approved for 202405 as same issue is also seen there.

@mssonicbld
Copy link
Copy Markdown
Collaborator

Cherry-pick PR to 202405: #16890

mssonicbld pushed a commit that referenced this pull request Feb 11, 2025
Description of PR
Summary:
Fixes # (issue) 31202914

From #16446 we are changing to use regex to capture the timestamp for pfc timer accuracy. However, the regex does not cover the scenario where date digit is 1. For example: 2025 Jan  5 00:53:14.103188 

Approach
What is the motivation for this PR?
Comparing between:

2025 Jan 26 17:36:31.27789
2025 Feb  2 15:17:24.055182
We can see that we might need up to 2 spaces after month and the number of day digits can vary between 1 to 2.

How did you do it?
Adjust the regex so it matches for both format

How did you verify/test it?
image

Signed-off-by: Austin Pham <austinpham@microsoft.com>
nnelluri-cisco pushed a commit to nnelluri-cisco/sonic-mgmt that referenced this pull request Mar 15, 2025
Description of PR
Summary:
Fixes # (issue) 31202914

From sonic-net#16446 we are changing to use regex to capture the timestamp for pfc timer accuracy. However, the regex does not cover the scenario where date digit is 1. For example: 2025 Jan  5 00:53:14.103188 

Approach
What is the motivation for this PR?
Comparing between:

2025 Jan 26 17:36:31.27789
2025 Feb  2 15:17:24.055182
We can see that we might need up to 2 spaces after month and the number of day digits can vary between 1 to 2.

How did you do it?
Adjust the regex so it matches for both format

How did you verify/test it?
image

Signed-off-by: Austin Pham <austinpham@microsoft.com>
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