Skip to content

Commit

Permalink
NC | Online Upgrade GPFS fixes + new host but existing system fix
Browse files Browse the repository at this point in the history 
Signed-off-by: Romy <[email protected]>
  • Loading branch information
@romayalon
romayalon committed Nov 27, 2024
1 parent e5e6a35 commit cf4140c
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 30 deletions.
4 changes: 2 additions & 2 deletions src/sdk/config_fs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,7 @@ class ConfigFS {
} else {
if (updated_system_json[hostname]?.current_version) return;
const new_host_data = this._get_new_hostname_data();
updated_system_json = { ...updated_system_json, new_host_data };
updated_system_json = { ...updated_system_json, [hostname]: new_host_data };
await this.update_system_config_file(JSON.stringify(updated_system_json));
dbg.log0('updated NC system data with version: ', pkg.version);
return updated_system_json;
Expand Down Expand Up @@ -1171,7 +1171,7 @@ class ConfigFS {
return {
[os.hostname()]: {
current_version: pkg.version,
upgrade_history: {
upgrade_history: {
successful_upgrades: []
},
},
Expand Down
42 changes: 19 additions & 23 deletions src/upgrade/nc_upgrade_scripts/1.0.0/config_dir_restructure.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* Copyright (C) 2024 NooBaa */
'use strict';

const util = require('util');
const path = require('path');
const P = require('../../../util/promise');
const config = require('../../../../config');
Expand Down Expand Up @@ -37,13 +38,11 @@ async function run({ dbg }) {

await config_fs.create_dir_if_missing(config_fs.identities_dir_path);
await config_fs.create_dir_if_missing(config_fs.accounts_by_name_dir_path);
const tmp_access_keys_path = path.join(config_fs.access_keys_dir_path, native_fs_utils.get_config_files_tmpdir());
await config_fs.create_dir_if_missing(tmp_access_keys_path);

const old_account_names = await config_fs.list_old_accounts();
const failed_accounts = await upgrade_accounts_config_files(config_fs, old_account_names, tmp_access_keys_path, dbg);
const failed_accounts = await upgrade_accounts_config_files(config_fs, old_account_names, dbg);

if (failed_accounts.length > 0) throw new Error('NC upgrade process failed, failed_accounts array length is bigger than 0' + failed_accounts);
if (failed_accounts.length > 0) throw new Error('NC upgrade process failed, failed_accounts array length is bigger than 0' + util.inspect(failed_accounts));
await move_old_accounts_dir(fs_context, config_fs, old_account_names, dbg);
} catch (err) {
dbg.error('NC upgrade process failed due to - ', err);
Expand All @@ -60,13 +59,13 @@ async function run({ dbg }) {
* @param {*} dbg
* @returns {Promise<Object[]>}
*/
async function upgrade_accounts_config_files(config_fs, old_account_names, tmp_access_keys_path, dbg) {
async function upgrade_accounts_config_files(config_fs, old_account_names, dbg) {
const failed_accounts = [];
for (const account_name of old_account_names) {
let retries = 3;
while (retries > 0) {
try {
await upgrade_account_config_file(config_fs, account_name, tmp_access_keys_path, dbg);
await upgrade_account_config_file(config_fs, account_name, dbg);
break;
} catch (err) {
retries -= 1;
Expand All @@ -90,18 +89,17 @@ async function upgrade_accounts_config_files(config_fs, old_account_names, tmp_a
* 1.4. delete account old path
* @param {import('../../../sdk/config_fs').ConfigFS} config_fs
* @param {String} account_name
* @param {String} tmp_access_keys_path
* @param {*} dbg
* @returns
*/
async function upgrade_account_config_file(config_fs, account_name, tmp_access_keys_path, dbg) {
async function upgrade_account_config_file(config_fs, account_name, dbg) {
let account_upgrade_params;
const fs_context = config_fs.fs_context;
try {
account_upgrade_params = await prepare_account_upgrade_params(config_fs, account_name);
await create_identity_if_missing(fs_context, account_upgrade_params, dbg);
await create_account_name_index_if_missing(config_fs, account_upgrade_params, dbg);
await create_account_access_keys_index_if_missing(config_fs, account_upgrade_params, tmp_access_keys_path, dbg);
await create_account_access_keys_index_if_missing(config_fs, account_upgrade_params, dbg);
} catch (err) {
dbg.warn(`upgrade account config failed ${account_name}, err ${err}`);
throw err;
Expand Down Expand Up @@ -130,7 +128,7 @@ async function prepare_account_upgrade_params(config_fs, account_name) {
const identity_dir_path = config_fs.get_identity_dir_path_by_id(_id);

const is_gpfs = native_fs_utils._is_gpfs(fs_context);
const dst_file = is_gpfs ? await native_fs_utils.open_file(fs_context, undefined, identity_path, 'r') : undefined;
const dst_file = is_gpfs ? await native_fs_utils.open_file(fs_context, undefined, identity_path, 'w') : undefined;

return {
account_name,
Expand Down Expand Up @@ -202,38 +200,36 @@ async function create_account_name_index_if_missing(config_fs, account_upgrade_p
* @param {*} dbg
* @returns {Promise<Void>}
*/
async function create_account_access_keys_index_if_missing(config_fs, account_upgrade_params, tmp_access_keys_path, dbg) {
async function create_account_access_keys_index_if_missing(config_fs, account_upgrade_params, dbg) {
const { fs_context } = config_fs;
const { access_keys, _id, identity_path } = account_upgrade_params;
const backup_access_keys_path = path.join(config_fs.config_root, '.backup_access_keys_dir/');

await config_fs.create_dir_if_missing(backup_access_keys_path);
if (access_keys) {
for (const { access_key } of access_keys) {
const access_key_path = config_fs.get_account_or_user_path_by_access_key(access_key);
const tmp_access_key_path = path.join(tmp_access_keys_path, native_fs_utils.get_config_files_tmpdir());
const tmp_access_key_path = path.join(backup_access_keys_path, access_key);
const account_config_relative_path = config_fs.get_account_relative_path_by_id(_id);

const access_key_already_linked = await config_fs._is_symlink_pointing_to_identity(access_key_path, identity_path);
if (access_key_already_linked) continue;
try {
const access_key_already_linked = await config_fs._is_symlink_pointing_to_identity(access_key_path, identity_path);
if (access_key_already_linked) continue;
} catch (err) {
if (err.code === 'ENOENT') dbg.warn(`account access key is missing, re-creating ${access_key}`);
}

try {
await nb_native().fs.symlink(fs_context, account_config_relative_path, tmp_access_key_path);
} catch (err) {
if (err.code !== 'EEXIST') throw err;
dbg.warn(`account access key backup was already linked on a previous run of the upgrade script, continue ${access_keys}, ${tmp_access_key_path}`);
}
let src_file;
try {
if (native_fs_utils._is_gpfs(fs_context)) {
src_file = await nb_native().fs.open(fs_context, tmp_access_key_path, 'r', native_fs_utils.get_umasked_mode(config.BASE_MODE_CONFIG_FILE));
await src_file.linkfileat(fs_context, access_key_path);
} else {
await nb_native().fs.rename(fs_context, tmp_access_key_path, access_key_path);
}
await nb_native().fs.rename(fs_context, tmp_access_key_path, access_key_path);
} catch (err) {
if (err.code !== 'EEXIST') throw err;
dbg.warn(`account access key was already linked on a previous run of the upgrade script, skipping ${access_keys}, ${_id}`);
} finally {
if (src_file) await src_file.close(fs_context);
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/util/native_fs_utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,12 @@ async function safe_unlink(fs_context, src_path, src_ver_info, gpfs_options, tmp

async function safe_link(fs_context, src_path, dst_path, src_ver_info, gpfs_options) {
if (_is_gpfs(fs_context)) {
const { src_file = undefined, dir_file = undefined } = gpfs_options;
if (dir_file) {
await safe_link_gpfs(fs_context, src_path, src_file, dir_file);
const { src_file = undefined, dst_file = undefined } = gpfs_options;
if (dst_file) {
await safe_link_gpfs(fs_context, dst_path, src_file, dst_file);
} else {
dbg.error(`safe_link: dir_file is ${dir_file}, cannot use it to call safe_unlink_gpfs`);
throw new Error(`dir_file is ${dir_file}, need a value to safe unlink GPFS`);
dbg.error(`safe_link: dst_file is ${dst_file}, cannot use it to call safe_unlink_gpfs`);
throw new Error(`dst_file is ${dst_file}, need a value to safe unlink GPFS`);
}
} else {
await safe_link_posix(fs_context, src_path, dst_path, src_ver_info);
Expand Down

0 comments on commit cf4140c

Please sign in to comment.