vitalif
/
vitastor
5
4
Fork 9
Code Issues 1 Pull Requests 2 Actions Releases 69 Wiki Activity

Fix 32-bit build warnings and one error again :-)
Test / buildenv (push) Successful in 11s Details
Test / build (push) Successful in 3m6s Details
Test / test_cas (push) Successful in 10s Details
Test / make_test (push) Successful in 37s Details
Test / test_change_pg_count (push) Successful in 34s Details
Test / test_change_pg_size (push) Successful in 7s Details
Test / test_change_pg_count_ec (push) Successful in 31s Details
Test / test_create_nomaxid (push) Successful in 7s Details
Test / test_etcd_fail (push) Successful in 1m47s Details
Test / test_interrupted_rebalance_imm (push) Successful in 1m49s Details
Test / test_add_osd (push) Successful in 2m39s Details
Test / test_failure_domain (push) Successful in 58s Details
Test / test_interrupted_rebalance (push) Successful in 3m23s Details
Test / test_snapshot (push) Successful in 50s Details
Test / test_interrupted_rebalance_ec (push) Successful in 2m0s Details
Test / test_snapshot_ec (push) Successful in 34s Details
Test / test_minsize_1 (push) Successful in 14s Details
Test / test_move_reappear (push) Successful in 20s Details
Test / test_rm (push) Successful in 15s Details
Test / test_interrupted_rebalance_ec_imm (push) Successful in 2m25s Details
Test / test_snapshot_down (push) Successful in 23s Details
Test / test_snapshot_down_ec (push) Successful in 29s Details
Test / test_splitbrain (push) Successful in 18s Details
Test / test_snapshot_chain (push) Successful in 2m19s Details
Test / test_snapshot_chain_ec (push) Successful in 2m52s Details
Test / test_rebalance_verify_imm (push) Successful in 3m7s Details
Test / test_root_node (push) Successful in 8s Details
Test / test_rebalance_verify (push) Successful in 3m36s Details
Test / test_switch_primary (push) Successful in 40s Details
Test / test_write (push) Successful in 41s Details
Test / test_write_no_same (push) Successful in 18s Details
Test / test_write_xor (push) Successful in 1m6s Details
Test / test_rebalance_verify_ec (push) Successful in 4m25s Details
Test / test_rebalance_verify_ec_imm (push) Successful in 3m52s Details
Test / test_heal_pg_size_2 (push) Successful in 3m21s Details
Test / test_heal_ec (push) Successful in 5m27s Details
Test / test_heal_csum_32k_dmj (push) Successful in 5m56s Details
Test / test_heal_csum_32k_dj (push) Successful in 5m49s Details
Test / test_heal_csum_32k (push) Successful in 6m43s Details
Test / test_osd_tags (push) Successful in 21s Details
Test / test_enospc (push) Successful in 2m18s Details
Test / test_heal_csum_4k_dmj (push) Successful in 6m43s Details
Test / test_heal_csum_4k (push) Successful in 6m27s Details
Test / test_heal_csum_4k_dj (push) Successful in 6m29s Details
Test / test_enospc_imm (push) Successful in 1m5s Details
Test / test_enospc_xor (push) Successful in 1m38s Details
Test / test_scrub (push) Successful in 37s Details
Test / test_scrub_zero_osd_2 (push) Successful in 32s Details
Test / test_enospc_imm_xor (push) Successful in 45s Details
Test / test_scrub_xor (push) Successful in 33s Details
Test / test_scrub_pg_size_6_pg_minsize_4_osd_count_6_ec (push) Successful in 34s Details
Test / test_scrub_ec (push) Successful in 34s Details
Test / test_scrub_pg_size_3 (push) Successful in 43s Details
Test / test_nfs (push) Successful in 13s Details

master
Vitaliy Filippov 2024-04-11 22:49:33 +03:00
parent ff4414d37e
commit 266d038b11
7 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli_pool_ls.cpp
View File

@ -205,7 +205,7 @@ resume_1:
{ "raw_to_usable", pool_stats[pool_cfg.id]["raw_to_usable"].number_value() },
{ "space_efficiency", pool_stats[pool_cfg.id]["space_efficiency"].number_value() },
{ "pg_real_size", pool_stats[pool_cfg.id]["pg_real_size"].uint64_value() },
{ "osd_count", pg_per_osd.size() },
{ "osd_count", (uint64_t)pg_per_osd.size() },
};
}
// Include full pool config

4
src/kv_cli.cpp
View File

@ -452,7 +452,7 @@ void kv_cli_t::handle_cmd(const std::vector<std::string> & cmd, std::function<vo
auto name = cmd.size() > 1 ? cmd[1] : "";
uint64_t pool_id = 0;
inode_t inode_id = 0;
int scanned = sscanf(name.c_str(), "%lu %lu", &pool_id, &inode_id);
int scanned = sscanf(name.c_str(), "%ju %ju", &pool_id, &inode_id);
if (scanned < 2 || !pool_id || !inode_id)
{
inode_id = 0;
@ -483,7 +483,7 @@ void kv_cli_t::handle_cmd(const std::vector<std::string> & cmd, std::function<vo
else
{
opened = true;
fprintf(interactive ? stdout : stderr, "Index opened. Current size: %lu bytes\n", db->get_size());
fprintf(interactive ? stdout : stderr, "Index opened. Current size: %ju bytes\n", db->get_size());
}
cb(res);
});

52
src/kv_db.cpp
View File

@ -250,14 +250,14 @@ int kv_block_t::parse(uint64_t offset, uint8_t *data, int size)
{
// empty block
if (offset != 0)
fprintf(stderr, "K/V: Block %lu is %s\n", offset, blk->magic == 0 ? "empty" : "cleared");
fprintf(stderr, "K/V: Block %ju is %s\n", offset, blk->magic == 0 ? "empty" : "cleared");
return -ENOTBLK;
}
if (blk->magic != KV_BLOCK_MAGIC || blk->block_size != size ||
!blk->type || blk->type > KV_EMPTY || blk->items > KV_BLOCK_MAX_ITEMS)
{
// invalid block
fprintf(stderr, "K/V: Invalid block %lu magic, size, type or item count\n", offset);
fprintf(stderr, "K/V: Invalid block %ju magic, size, type or item count\n", offset);
return -EILSEQ;
}
assert(!this->type);
@ -266,13 +266,13 @@ int kv_block_t::parse(uint64_t offset, uint8_t *data, int size)
this->key_ge = read_string(data, size, &pos);
if (pos < 0)
{
fprintf(stderr, "K/V: Invalid block %lu left bound\n", offset);
fprintf(stderr, "K/V: Invalid block %ju left bound\n", offset);
return -EILSEQ;
}
this->key_lt = read_string(data, size, &pos);
if (pos < 0)
{
fprintf(stderr, "K/V: Invalid block %lu right bound\n", offset);
fprintf(stderr, "K/V: Invalid block %ju right bound\n", offset);
return -EILSEQ;
}
if (this->type == KV_INT_SPLIT || this->type == KV_LEAF_SPLIT)
@ -280,12 +280,12 @@ int kv_block_t::parse(uint64_t offset, uint8_t *data, int size)
this->right_half = read_string(data, size, &pos);
if (pos < 0)
{
fprintf(stderr, "K/V: Invalid block %lu split bound\n", offset);
fprintf(stderr, "K/V: Invalid block %ju split bound\n", offset);
return -EILSEQ;
}
if (pos+8 > size)
{
fprintf(stderr, "K/V: Invalid block %lu split block ref\n", offset);
fprintf(stderr, "K/V: Invalid block %ju split block ref\n", offset);
return -EILSEQ;
}
this->right_half_block = *(uint64_t*)(data+pos);
@ -296,13 +296,13 @@ int kv_block_t::parse(uint64_t offset, uint8_t *data, int size)
auto key = read_string(data, size, &pos);
if (pos < 0)
{
fprintf(stderr, "K/V: Invalid block %lu key %d\n", offset, i);
fprintf(stderr, "K/V: Invalid block %ju key %d\n", offset, i);
return -EILSEQ;
}
auto value = read_string(data, size, &pos);
if (pos < 0)
{
fprintf(stderr, "K/V: Invalid block %lu value %d\n", offset, i);
fprintf(stderr, "K/V: Invalid block %ju value %d\n", offset, i);
return -EILSEQ;
}
this->data[key] = value;
@ -470,7 +470,7 @@ static void dump_str(const std::string & str)
void kv_block_t::dump(int base_level)
{
printf(
"{\n \"block\": %lu,\n \"level\": %d,\n \"type\": \"%s\",\n \"range\": [",
"{\n \"block\": %ju,\n \"level\": %d,\n \"type\": \"%s\",\n \"range\": [",
offset, base_level+level,
type < sizeof(block_type_names)/sizeof(block_type_names[0]) ? block_type_names[type] : "unknown"
);
@ -482,7 +482,7 @@ void kv_block_t::dump(int base_level)
{
printf(" \"right_half\": { ");
dump_str(right_half);
printf(": %lu },\n", right_half_block);
printf(": %ju },\n", right_half_block);
}
printf(" \"data\": {\n");
for (auto & kv: data)
@ -493,7 +493,7 @@ void kv_block_t::dump(int base_level)
if (type == KV_LEAF || type == KV_LEAF_SPLIT || kv.second.size() != 8)
dump_str(kv.second);
else
printf("%lu", *(uint64_t*)kv.second.c_str());
printf("%ju", *(uint64_t*)kv.second.c_str());
printf(",\n");
}
printf(" }\n}\n");
@ -1037,7 +1037,7 @@ void kv_op_t::get()
{
if (cur_block != 0)
{
fprintf(stderr, "K/V: Hit empty block %lu while searching\n", cur_block);
fprintf(stderr, "K/V: Hit empty block %ju while searching\n", cur_block);
finish(-EILSEQ);
}
else
@ -1095,7 +1095,7 @@ int kv_op_t::handle_block(int res, int refresh, bool stop_on_split)
bool fatal = !this->updating_on_path && this->retry > 0;
if (fatal || db->log_level > 0)
{
fprintf(stderr, "K/V: %sgot unrelated block %lu: key=%s range=[%s, %s) from=[%s, %s)\n",
fprintf(stderr, "K/V: %sgot unrelated block %ju: key=%s range=[%s, %s) from=[%s, %s)\n",
fatal ? "Error: " : "Warning: read/update collision: ",
cur_block, key.c_str(), blk->key_ge.c_str(), blk->key_lt.c_str(), prev_key_ge.c_str(), prev_key_lt.c_str());
if (fatal)
@ -1160,7 +1160,7 @@ int kv_op_t::handle_block(int res, int refresh, bool stop_on_split)
auto child_it = blk->data.upper_bound(key);
if (child_it == blk->data.begin())
{
fprintf(stderr, "K/V: Internal block %lu misses boundary for %s\n", cur_block, key.c_str());
fprintf(stderr, "K/V: Internal block %ju misses boundary for %s\n", cur_block, key.c_str());
return -EILSEQ;
}
auto m = child_it == blk->data.end()
@ -1169,7 +1169,7 @@ int kv_op_t::handle_block(int res, int refresh, bool stop_on_split)
child_it--;
if (child_it->second.size() != sizeof(uint64_t))
{
fprintf(stderr, "K/V: Internal block %lu reference is not 8 byte long\n", cur_block);
fprintf(stderr, "K/V: Internal block %ju reference is not 8 byte long\n", cur_block);
blk->dump(db->base_block_level);
return -EILSEQ;
}
@ -1246,7 +1246,7 @@ static void write_block(kv_db_t *db, kv_block_t *blk, std::function<void(int)> c
blk->dump(db->base_block_level);
uint64_t old_size = blk->data_size;
blk->set_data_size();
fprintf(stderr, "K/V: block %lu (ptr=%lx) grew too large: tracked %lu, but real is %u bytes\n",
fprintf(stderr, "K/V: block %ju (ptr=%jx) grew too large: tracked %ju, but real is %u bytes\n",
blk->offset, (uint64_t)blk, old_size, blk->data_size);
abort();
return;
@ -1479,7 +1479,7 @@ void kv_op_t::update_find()
else if (cur_block == 0)
finish(-ENOENT);
else
fprintf(stderr, "K/V: Hit empty block %lu while searching\n", cur_block);
fprintf(stderr, "K/V: Hit empty block %ju while searching\n", cur_block);
}
else if (res == -ECHILD)
{
@ -1506,7 +1506,7 @@ void kv_op_t::create_root()
// if a referenced non-root block is empty, we just return an error.
if (cur_block != 0 || db->next_free != 0)
{
fprintf(stderr, "K/V: create_root called with non-empty DB (cur_block=%lu)\n", cur_block);
fprintf(stderr, "K/V: create_root called with non-empty DB (cur_block=%ju)\n", cur_block);
finish(-EILSEQ);
return;
}
@ -1551,7 +1551,7 @@ void kv_op_t::resume_split()
if (path.size() == 1)
{
// It shouldn't be the root block because we don't split it via INT_SPLIT/LEAF_SPLIT
fprintf(stderr, "K/V: resume_split at root item (cur_block=%lu)\n", cur_block);
fprintf(stderr, "K/V: resume_split at root item (cur_block=%ju)\n", cur_block);
finish(-EILSEQ);
return;
}
@ -1638,7 +1638,7 @@ void kv_op_t::update_block(int path_pos, bool is_delete, const std::string & key
{
blk->dump(0);
// Should not happen - we should have resumed the split
fprintf(stderr, "K/V: attempt to write into block %lu instead of resuming the split (got here from %s..%s)\n",
fprintf(stderr, "K/V: attempt to write into block %ju instead of resuming the split (got here from %s..%s)\n",
blk->offset, prev_key_ge.c_str(), prev_key_lt.c_str());
abort();
}
@ -1650,7 +1650,7 @@ void kv_op_t::update_block(int path_pos, bool is_delete, const std::string & key
// No need to split the block => just modify and write it
if ((blk->type == KV_LEAF_SPLIT || blk->type == KV_INT_SPLIT) && key >= blk->right_half)
{
fprintf(stderr, "K/V: attempt to modify %s in unrelated split block %lu [%s..%s..%s)\n",
fprintf(stderr, "K/V: attempt to modify %s in unrelated split block %ju [%s..%s..%s)\n",
key.c_str(), blk->offset, blk->key_ge.c_str(), blk->right_half.c_str(), blk->key_lt.c_str());
blk->dump(db->base_block_level);
abort();
@ -1753,11 +1753,11 @@ void kv_op_t::update_block(int path_pos, bool is_delete, const std::string & key
clear_block(db, left_blk, 0, [=, left_offset = left_blk->offset](int res)
{
if (res < 0)
fprintf(stderr, "Failed to clear unreferenced block %lu: %s (code %d)\n", left_offset, strerror(-res), res);
fprintf(stderr, "Failed to clear unreferenced block %ju: %s (code %d)\n", left_offset, strerror(-res), res);
clear_block(db, right_blk, 0, [=, right_offset = right_blk->offset](int res)
{
if (res < 0)
fprintf(stderr, "Failed to clear unreferenced block %lu: %s (code %d)\n", right_offset, strerror(-res), res);
fprintf(stderr, "Failed to clear unreferenced block %ju: %s (code %d)\n", right_offset, strerror(-res), res);
// CAS failure - zero garbage left_blk and right_blk and retry from the beginning
if (write_res == -EINTR)
update();
@ -1784,7 +1784,7 @@ void kv_op_t::update_block(int path_pos, bool is_delete, const std::string & key
if (path_pos == 0)
{
// Block number zero should always be the root block
fprintf(stderr, "K/V: root block is not 0, but %lu\n", cur_block);
fprintf(stderr, "K/V: root block is not 0, but %ju\n", cur_block);
cb(-EILSEQ);
return;
}
@ -1809,7 +1809,7 @@ void kv_op_t::update_block(int path_pos, bool is_delete, const std::string & key
clear_block(db, right_blk, 0, [=, right_offset = right_blk->offset](int res)
{
if (res < 0)
fprintf(stderr, "Failed to clear unreferenced block %lu: %s (code %d)\n", right_offset, strerror(-res), res);
fprintf(stderr, "Failed to clear unreferenced block %ju: %s (code %d)\n", right_offset, strerror(-res), res);
// CAS failure - zero garbage right_blk and retry from the beginning
if (write_res == -EINTR)
update();
@ -1860,7 +1860,7 @@ void kv_op_t::next_handle_block(int res, int refresh)
finish(-ENOENT);
else
{
fprintf(stderr, "K/V: Hit empty block %lu while searching\n", cur_block);
fprintf(stderr, "K/V: Hit empty block %ju while searching\n", cur_block);
finish(-EILSEQ);
}
}

4
src/kv_stress.cpp
View File

@ -632,7 +632,7 @@ void kv_test_t::print_stats(kv_test_stat_t & prev_stat, timespec & prev_stat_tim
char buf[128] = { 0 };
for (int i = 0; i < sizeof(lats)/sizeof(lats[0]); i++)
{
snprintf(buf, sizeof(buf)-1, "%.1f %s/s (%lu us)", (lats[i]->count-prev[i]->count)*1000000.0/usec,
snprintf(buf, sizeof(buf)-1, "%.1f %s/s (%ju us)", (lats[i]->count-prev[i]->count)*1000000.0/usec,
lats[i]->name, (lats[i]->usec-prev[i]->usec)/(lats[i]->count-prev[i]->count > 0 ? lats[i]->count-prev[i]->count : 1));
int k;
for (k = strlen(buf); k < strlen(lats[i]->name)+21; k++)
@ -652,7 +652,7 @@ void kv_test_t::print_stats(kv_test_stat_t & prev_stat, timespec & prev_stat_tim
if (lats[i]->count > prev[i]->count)
{
printf(
",\"%s\":{\"avg\":{\"iops\":%.1f,\"usec\":%lu},\"total\":{\"count\":%lu,\"usec\":%lu}}",
",\"%s\":{\"avg\":{\"iops\":%.1f,\"usec\":%ju},\"total\":{\"count\":%ju,\"usec\":%ju}}",
lats[i]->name, (lats[i]->count-prev[i]->count)*1000000.0/usec,
(lats[i]->usec-prev[i]->usec)/(lats[i]->count-prev[i]->count),
lats[i]->count, lats[i]->usec

2
src/nfs_block.cpp
View File

@ -497,7 +497,7 @@ static void extend_inode(nfs_client_t *self, uint64_t inode, uint64_t new_size)
auto & ext = self->parent->blockfs->extends[inode];
if (r.err)
{
fprintf(stderr, "Error extending inode %lu to %lu bytes: %s\n", inode, new_size, r.text.c_str());
fprintf(stderr, "Error extending inode %ju to %ju bytes: %s\n", inode, new_size, r.text.c_str());
}
if (r.err == EAGAIN || ext.next_extend > ext.cur_extend)
{

2
src/nfs_kv_readdir.cpp
View File

@ -258,7 +258,7 @@ resume_3:
auto name = kv_direntry_filename(st->cur_key);
if (st->self->parent->trace)
{
fprintf(stderr, "[%d] READDIR %ju %lu %s\n",
fprintf(stderr, "[%d] READDIR %ju %ju %s\n",
st->self->nfs_fd, st->dir_ino, st->offset, name.c_str());
}
auto fh = kv_fh(ino);

2
src/nfs_kv_write.cpp
View File

@ -608,7 +608,7 @@ static void nfs_kv_extend_inode(nfs_kv_write_state *st, int state, int base_stat
auto ientry = json11::Json::parse(old_value, err).object_items();
if (err != "")
{
fprintf(stderr, "Invalid JSON in inode %lu = %s: %s\n", st->ino, old_value.c_str(), err.c_str());
fprintf(stderr, "Invalid JSON in inode %ju = %s: %s\n", st->ino, old_value.c_str(), err.c_str());
st->res2 = -EINVAL;
return false;
}