Commit 4abefb16 authored by Marc Vef's avatar Marc Vef
Browse files

Removed TransactionDB for now. Causes crash at shutting down adafs

parent 01cd5eba

lfs/src/db/util.cpp

+9 −8
Original line number Diff line number Diff line
@@ -20,19 +20,20 @@ bool init_rocksdb() { 
    optimize_rocksdb(options);



    ADAFS_DATA->rdb_options(options);

    rocksdb::OptimisticTransactionDB* txn_db;

    rocksdb::OptimisticTransactionOptions txn_options{};

    ADAFS_DATA->txn_rdb_options(txn_options);

//    rocksdb::OptimisticTransactionDB* txn_db;

//    rocksdb::OptimisticTransactionOptions txn_options{};

//    ADAFS_DATA->txn_rdb_options(txn_options);

    ADAFS_DATA->spdlogger()->info("RocksDB options set. About to connect...");

    // open DB

    auto s_txn = rocksdb::OptimisticTransactionDB::Open(ADAFS_DATA->rdb_options(), ADAFS_DATA->rdb_path(), &txn_db);

//    auto s = rocksdb::OptimisticTransactionDB::Open(ADAFS_DATA->rdb_options(), ADAFS_DATA->rdb_path(), &txn_db);

    auto s = rocksdb::DB::Open(ADAFS_DATA->rdb_options(), ADAFS_DATA->rdb_path(), &db);



    if (s_txn.ok()) {

        db = txn_db->GetBaseDB(); // db connection for db operations without transactions

    if (s.ok()) {

//        db = txn_db->GetBaseDB(); // db connection for db operations without transactions

        shared_ptr<rocksdb::DB> s_db(db);

        ADAFS_DATA->rdb(s_db);

        shared_ptr<rocksdb::OptimisticTransactionDB> s_txn_db(txn_db);

        ADAFS_DATA->txn_rdb(s_txn_db);

//        shared_ptr<rocksdb::OptimisticTransactionDB> s_txn_db(txn_db);

//        ADAFS_DATA->txn_rdb(s_txn_db);

        ADAFS_DATA->spdlogger()->info("RocksDB connection established.");

        return true;

    } else {