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

Fix tests and update log messages. #995

Merged
merged 1 commit into from
Oct 12, 2023
Merged

Fix tests and update log messages. #995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions downstairs/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3140,8 +3140,6 @@ pub async fn start_downstairs(
"Upstairs <-> Downstairs Message Version: {}", CRUCIBLE_MESSAGE_VERSION
);

info!(log, "Using address: {:?}", local_addr);

let repair_address = match address {
IpAddr::V4(ipv4) => SocketAddr::new(std::net::IpAddr::V4(ipv4), rport),
IpAddr::V6(ipv6) => SocketAddr::new(std::net::IpAddr::V6(ipv6), rport),
Expand Down
20 changes: 12 additions & 8 deletions downstairs/src/region.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ impl Region {

let number_of_files_limit = match rlim.rlim_cur.cmp(&rlim.rlim_max) {
std::cmp::Ordering::Less => {
info!(
debug!(
log,
"raising number of open files limit to from {} to {}",
rlim.rlim_cur,
Expand All @@ -143,7 +143,7 @@ impl Region {
}

Ordering::Equal => {
info!(
debug!(
log,
"current number of open files limit {} is already the maximum",
rlim.rlim_cur,
Expand Down Expand Up @@ -268,7 +268,9 @@ impl Region {
def.database_read_version(),
);
}
info!(log, "Database read version {}", def.database_read_version());
if verbose {
info!(log, "Database read version {}", def.database_read_version());
}

if def.database_write_version()
!= crucible_common::DATABASE_WRITE_VERSION
Expand All @@ -279,11 +281,13 @@ impl Region {
def.database_write_version(),
);
}
info!(
log,
"Database write version {}",
def.database_write_version()
);
if verbose {
info!(
log,
"Database write version {}",
def.database_write_version()
);
}

/*
* Open every extent that presently exists.
Expand Down
2 changes: 1 addition & 1 deletion tools/test_repair_perf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ function repair_round() {
"$ct" one "${args[@]}" \
-q -g "$gen" --verify-out alan \
--verify-in alan \
--verify \
--verify-at-start \
--retry-activate >> "$test_log" 2>&1
result=$?

Expand Down
10 changes: 7 additions & 3 deletions tools/test_restart_repair.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ export region_dir="./var"

echo "" > ${loop_log}
echo "starting $(date)" | tee ${loop_log}
echo "" > ${test_log}
echo "Tail $test_log for test output"
echo "Tail $loop_log for summary output"
echo "Tail $dsc_log for dsc outout"
Expand Down Expand Up @@ -210,8 +211,11 @@ while [[ $count -le $loops ]]; do
rm -rf "$region_dir"/8830
cp -R "$region_dir"/8830.old "$region_dir"/8830
fi
echo "$(date) regions moved, current dump output:" >> "$test_log"
cdump.sh >> "$test_log" 2>&1
echo "$(date) regions moved, current dump outputs:" >> "$test_log"
$cds dump --no-color -d "$region_dir"/8810 \
-d "$region_dir"/8820 \
-d "$region_dir"/8830 >> "$test_log" 2>&1

echo "$(date) resume downstairs" >> "$test_log"
bring_all_downstairs_online

Expand All @@ -225,7 +229,7 @@ while [[ $count -le $loops ]]; do
"$ct" one "${args[@]}" \
-q -g "$gen" --verify-out alan \
--verify-in alan \
--verify \
--verify-at-start \
--retry-activate >> "$test_log" 2>&1
result=$?
if [[ $result -ne 0 ]]; then
Expand Down