Skip to content
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

Jump to bottom

Update b1.0 #3601

Merged
merged 13 commits into from
Jan 19, 2024
Merged

Update b1.0 #3601

merged 13 commits into from
Jan 19, 2024

Conversation

webbnh
Copy link
Member

@webbnh webbnh commented Jan 18, 2024

This PR brings the b1.0 branch up to date with the main branch. The only difference between the two is the contents of jenkins/branch.name.

PRs #3592 through #3598 will be new to this branch; the commits for PR #3586 through #3591 are already on the b1.0 branch, so I'm not sure why they are included in this PR.

dbutenhof and others added 13 commits December 20, 2023 08:12
@dbutenhof
Clean up (distributed-system-analysis#3586)
1d37d24 
This combines a few issues: first, I've wanted to filter based on the unpacked
tarball size, but some tarballs are beyond the range of the SQL `INTEGER` type
and cause SQL cast errors -- change the interpretation of the `int` filter and
sort type to `BigInteger`. Also cleans up the logging around retried Sync
transaction errors, only logging warnings when it can't determine that the
error is a PostgreSQL serialization error. (I hope: this is hard to provoke in
casual testing.) Finally, clean up the logging of cached unpacked size by
avoiding two separate logs (without dataset name) on unpack, and adding a log
of the final unpacked size when we compute it.
@MVarshini
PBENCH-1306 (distributed-system-analysis#3588)
e894edb 
Sort datasets by uploaded time
@MVarshini
End time column update (distributed-system-analysis#3587)
2a1223b 
* PBENCH-1307
End time column update
@dbutenhof
Operations cleanup (distributed-system-analysis#3589)
010037d
@MVarshini
PBENCH-1311 (distributed-system-analysis#3590)
b7e6a5f 
Undable to update date
@MVarshini
Visualization Page Pagination (distributed-system-analysis#3591)
6161099 
* PBENCH-1300
Visualization Page Pagination
@MVarshini
PBENCH-1313 (distributed-system-analysis#3592)
314ded3 
Display metadata modal is empty
@MVarshini @webbnh
PBENCH-1309
442026c 
Overview page displays Public datasets
@MVarshini @webbnh
review comments
5d9ce4d
@dbutenhof
Another tweak to intake metadata problems (distributed-system-analysi…
3db0cf9 
…s#3595)

* Another tweak to intake metadata problems

Make sure we can't end up with undefined `metadata`.

Record details of `metadata.log` access to `run.controller` without adding
a ton of separate messages.
@MVarshini
Update TOC page (distributed-system-analysis#3580)
aaa842a 
* PBENCH-1216
TOC page update
@dbutenhof
Minor logging cleanup (distributed-system-analysis#3598)
58acfe9 
* Minor logging cleanup

Minimize cache logging: details were useful when cache management first went
in, but are now disruptive during ops review.
@webbnh
Merge remote-tracking branch 'origin/main' into update_b1.0_take_3
bf04036
@webbnh webbnh added Server Dashboard Of and relating to the Dashboard GUI labels Jan 18, 2024
@webbnh webbnh requested a review from dbutenhof January 18, 2024 23:14
@webbnh webbnh self-assigned this Jan 18, 2024
dbutenhof
dbutenhof approved these changes Jan 19, 2024
View reviewed changes
Copy link
Member

@dbutenhof dbutenhof left a comment

Choose a reason for hiding this comment

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

OK, so why did GitHub re-integrate commits already on the branch? That's ... weird, and maybe a bit disturbing. But ultimately I'll trust your comparison of the final state, and I don't see anything extremely obviously different from what I think I expect. 😕

@webbnh
Copy link
Member Author

webbnh commented Jan 19, 2024

why did GitHub re-integrate commits already on the branch? That's ... weird, and maybe a bit disturbing.

I think the blame (eh-hem) falls on Git. If I look at the history tree, the common ancestor between main and b1.0 is

070b17080 Handle missing Opensearch indices (#3584)

which, on the b1.0 branch, is followed by

ff949f43b Correct Jenkins branchname value

and then by the same six commits which are on the main branch...which makes sense, because that commit is the first on that we added to the b1.0 branch and then we merged the commits from main later.

So, (I theorize) now that we're merging main onto the b1.0 branch again, it starts at the branch point and lists all the commits from main to be added, but, when the merge actually happens, Git determines that the first six commits are already present and skips adding them; thus, the net result is that there is only one commit different, which is the Jenkins branchname value.

So, I don't really like it, but it seems to make sense, and it seems to produce the correct result. (And, really, we should not be rebasing the b1.0 branch and we should be merging main into it, so, yeah, we're being forced to do the right thing, even if the process was kind of cumbersome.) My main concern was that I had to do a manual merge in the process (and that I botched it the first time!).

But, all's well that ends.

@webbnh webbnh merged commit aac53df into distributed-system-analysis:b1.0 Jan 19, 2024
4 checks passed
@webbnh webbnh deleted the update_b1.0_take_3 branch January 19, 2024 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dbutenhof dbutenhof dbutenhof approved these changes

Assignees

@webbnh webbnh

Labels
Dashboard Of and relating to the Dashboard GUI Server
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@webbnh @dbutenhof @MVarshini