/*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
static struct fsck_args_info conf;
INIT_FSCK_ERRLISTS;
-INIT_STDERR_LOGGING(conf.loglevel_arg);
+
+static int loglevel;
+INIT_STDERR_LOGGING(loglevel);
/* taken from git */
signed char hexval_table[256] = {
{
int i, j, ret;
- PARA_NOTICE_LOG("checking for range violations in index\n");
+ PARA_INFO_LOG("checking for range violations in index\n");
//PARA_DEBUG_LOG("%d rows. %d columns\n", t->num_rows, t->desc->num_columns);
t->num_invalid_rows = 0;
for (i = 0; i < t->num_rows; i++) {
char *filename = index_filename(desc);
int ret;
- ret = mmap_full_file(filename, O_RDWR, map);
- PARA_INFO_LOG("mapping index %s: ret: %d, size: %zu\n", filename, ret, map->size);
+ ret = mmap_full_file(filename, O_RDWR, &map->data, &map->size, NULL);
+ PARA_DEBUG_LOG("mapping index %s: ret: %d, size: %zu\n", filename, ret, map->size);
free(filename);
return ret;
}
break;
}
}
- PARA_INFO_LOG("unmapping index\n");
+ PARA_DEBUG_LOG("unmapping index\n");
para_munmap(t->index_map.data, t->index_map.size);
filename = index_filename(t->desc);
ret = para_truncate(filename, t->row_index_size
const struct osl_column_description *cd;
uint32_t *loss = para_malloc(sizeof(uint32_t) * t->desc->num_columns);
- PARA_NOTICE_LOG("looking for mapped objects not contained in index\n");
+ PARA_INFO_LOG("looking for mapped objects not contained in index\n");
/* first count used bytes */
FOR_EACH_MAPPED_COLUMN(i, t, cd) {
loss[i] = t->columns[i].data_map.size;
if (!t->num_rows)
return 1;
hashes = para_malloc(t->num_rows * HASH_SIZE);
- PARA_NOTICE_LOG("looking for missing disk storage objects\n");
+ PARA_INFO_LOG("looking for missing disk storage objects\n");
for (i = 0; i < t->num_rows; i++) {
if (row_is_invalid(t, i))
continue;
static unsigned files_pruned;
-int prune_disk_storage_file(const char *path, const void *private_data)
+int prune_disk_storage_file(const char *path, void *private_data)
{
HASH_TYPE hash[HASH_SIZE];
unsigned flags = *(unsigned *)private_data;
int i, ret = 1;
const struct osl_column_description *cd;
- PARA_NOTICE_LOG("looking for unreferenced disk storage files\n");
+ PARA_INFO_LOG("looking for unreferenced disk storage files\n");
FOR_EACH_DISK_STORAGE_COLUMN(i, t, cd) {
char *dirname = column_filename(t, i);
- ret = for_each_file_in_dir(dirname, prune_disk_storage_file, &t->desc->flags);
+ ret = for_each_file_in_dir(dirname, prune_disk_storage_file,
+ (unsigned *)&t->desc->flags);
free(dirname);
}
if (files_pruned)
const struct osl_column_description *cd;
if (!t->num_disk_storage_columns) {
- PARA_NOTICE_LOG("no disk storage columns in table '%s', "
+ PARA_INFO_LOG("no disk storage columns in table '%s', "
"skipping checks\n", t->desc->name);
return 1;
}
ret = init_rbtrees(t);
if (ret < 0)
return ret;
- PARA_NOTICE_LOG("creating rbtree for disk storage hash values\n");
+ PARA_INFO_LOG("creating rbtree for disk storage hash values\n");
ret = osl_open_table(&hash_tree_table_desc, &hash_tree_table);
if (ret < 0)
goto out;
out_close_hash_tree:
osl_close_table(hash_tree_table, 0);
free(hashes);
+ hashes = NULL;
out:
clear_rbtrees(t); /* TODO why are we doing that here? Seems odd */
return ret;
para_munmap(map.data, map.size);
goto out;
}
- PARA_INFO_LOG("unmapping index\n");
+ PARA_DEBUG_LOG("unmapping index\n");
para_munmap(map.data, map.size);
if (conf.force_given)
ret = map_table(*t, (MAP_TBL_FL_IGNORE_DIRTY));
static void fsck_cleanup(struct osl_table *t)
{
int i;
+
+ if (!t)
+ return;
if (t->desc->column_descriptions) {
struct osl_column_description *cd;
for (i = 0; i < t->desc->num_columns; i++) {
}
free(t->desc->column_descriptions);
}
- if (t) {
- free(t->columns);
- free(t);
- }
+ free(t->columns);
+ free(t);
}
if (!t->num_disk_storage_columns)
return 1;
dsnc = t->disk_storage_name_column;
- ret = get_mapped_object(t, dsnc, i, &obj);
+ ret = get_mapped_object(t, dsnc, row_num, &obj);
if (ret < 0)
return ret;
hash_object(&obj, hash);
ds_name = disk_storage_name_of_hash(t, hash);
FOR_EACH_DISK_STORAGE_COLUMN(i, t, cd) {
filename = disk_storage_path(t, i, ds_name);
- ret = mmap_full_file(filename, O_RDONLY, &obj);
+ ret = mmap_full_file(filename, O_RDONLY, &obj.data, &obj.size, NULL);
free(filename);
if (ret < 0)
goto out;
current_dir = make_message("%s/rows_%u-%u", dump_dir, i, i + 999);
PARA_NOTICE_LOG("dumping rows %u - %u\n", i, i + 999);
ret = para_mkdir(current_dir, 0777);
- if (ret < 0)
+ if (ret < 0 && !is_errno(-ret, EEXIST))
goto out;
}
row_dir = make_message("%s/row_%03u", current_dir, i);
ret = para_mkdir(row_dir, 0777);
- if (ret < 0) {
+ if (ret < 0 && !is_errno(-ret, EEXIST)) {
free(row_dir);
goto out;
}
struct osl_table *t = NULL;
int fd, ret = fsck_init(desc, &t);
char *desc_file;
+ char *table_dump_dir = NULL;
if (ret < 0)
goto out;
ret = para_mkdir(dump_dir, 0777);
- if (ret < 0)
+ if (ret < 0 && !is_errno(-ret, EEXIST))
goto out;
- desc_file = make_message("%s/table_description.c", dump_dir);
+ table_dump_dir = make_message("%s/%s", dump_dir, desc->name);
+ ret = para_mkdir(table_dump_dir, 0777);
+ if (ret < 0 && !is_errno(-ret, EEXIST))
+ goto out;
+ desc_file = make_message("%s/table_description.c", table_dump_dir);
ret = para_open(desc_file, O_WRONLY | O_CREAT | O_EXCL, 0644);
free(desc_file);
if (ret < 0)
close(fd);
if (ret < 0)
goto out;
- ret = dump_rows(dump_dir, t);
+ ret = dump_rows(table_dump_dir, t);
out:
+ free(table_dump_dir);
fsck_cleanup(t);
return ret;
}
goto out_unmap;
}
free(lost_bytes);
- PARA_INFO_LOG("success\n");
out_unmap:
unmap_table(t, OSL_MARK_CLEAN);
out:
};
int ret;
+ PARA_INFO_LOG("checking table %s\n", table_name);
if (!conf.no_fsck_given) {
ret = fsck(&desc);
if (ret < 0)
- return ret;
+ goto out;
}
+ ret = 1;
if (!conf.dump_dir_given || !*conf.dump_dir_arg)
- return 1;
- return dump_table(conf.dump_dir_arg, &desc);
+ goto out;
+ ret = dump_table(conf.dump_dir_arg, &desc);
+out:
+ if (ret < 0)
+ PARA_ERROR_LOG("failed to check table %s\n", table_name);
+ else
+ PARA_NOTICE_LOG("successfully checked table %s\n", table_name);
+ return ret;
}
static int check_all_tables(char *base_dir)
return ret;
}
-int main(__a_unused int argc, char **argv)
+/**
+ * The praslash database check program.
+ *
+ * \param argc Usual arg count.
+ * \param argv Usual arg vector.
+ *
+ * \return \p EXIT_SUCCESS or \p EXIT_FAILURE.
+ */
+int main(int argc, char **argv)
{
int i, ret;
char *base_dir = NULL;
goto out;
}
HANDLE_VERSION_FLAG("fsck", conf);
+ loglevel = get_loglevel_by_name(conf.loglevel_arg);
if (conf.base_dir_given)
- base_dir = conf.base_dir_arg;
+ base_dir = para_strdup(conf.base_dir_arg);
else {
char *home = para_homedir();
base_dir = make_message("%s/.paraslash/afs_database", home);
break;
}
out:
- if (!conf.base_dir_given)
+ if (ret < 0) {
+ PARA_ERROR_LOG("%s%s: %s\n",
+ base_dir? "base_dir: " : "",
+ base_dir? base_dir : "",
+ para_strerror(-ret)
+ );
+ } else
+ PARA_NOTICE_LOG("success\n");
+ if (base_dir)
free(base_dir);
- if (ret < 0)
- PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
}