Commit 64dfafee authored by Manuel Wudka-Robles's avatar Manuel Wudka-Robles
Browse files

Merge pull request #15 from Seagate/features/nonblocking-kinetic-status 

Features/nonblocking kinetic status
parents 61a0fc81 263f2c12

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ else(USE_LOCAL_KINETIC_CLIENT) 
        kinetic_cpp_client

        PREFIX "vendor"

        GIT_REPOSITORY "git@github.com:Seagate/Kinetic-C-Client.git"

        GIT_TAG "f994d581aa0193dc1a8bfc6a83067caaa70f0b3a"

        GIT_TAG "d9348e1ee9ce55df828ef953e775205ed3ef46c3"

        BUILD_IN_SOURCE 1

        INSTALL_COMMAND ""

    )

src/delete_file_nonblocking.cc

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


using kinetic::KineticConnectionFactory;

using kinetic::KineticRecord;

using kinetic::StatusCode;

using kinetic::KineticStatus;

using kinetic::SimpleCallbackInterface;

using kinetic::Status;
@@ -25,8 +25,8 @@ public: 
        (*remaining_)--;

    }



    void Failure(StatusCode error) {

        printf("Error!\n");

    void Failure(KineticStatus error) {

        printf("Error: %d %s\n", static_cast<int>(error.statusCode()), error.message().c_str());

        exit(1);

    }

private:

src/ise.cc

+4 −2
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


using kinetic::KineticConnectionFactory;

using kinetic::Status;

using kinetic::KineticStatus;

using kinetic::KineticRecord;



using std::shared_ptr;
@@ -45,10 +46,11 @@ int main(int argc, char* argv[]) { 
        printf("Performing ISE on %s:%d with pin %s\n", host, port, argv[3]);

    }



    bool success = connection->blocking().InstantSecureErase(pin).ok();

    KineticStatus status = connection->blocking().InstantSecureErase(pin);

    bool success = status.ok();



    if (!success) {

        printf("Unable to execute ISE\n");

        printf("Unable to execute ISE: %d %s\n", static_cast<int>(status.statusCode()), status.message().c_str());

        return 1;

    }

src/read_file_nonblocking.cc

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ using kinetic::KineticRecord; 
using kinetic::ConnectionOptions;

using kinetic::GetCallbackInterface;

using kinetic::NonblockingKineticConnection;

using kinetic::StatusCode;

using kinetic::KineticStatus;



using std::shared_ptr;

using std::vector;
@@ -36,8 +36,8 @@ public: 
        fflush(stdout);

        (*remaining_)--;

    }

    void Failure(StatusCode error) {

        printf("Error: %d\n", static_cast<int>(error));

    void Failure(KineticStatus error) {

        printf("Error: %d %s\n", static_cast<int>(error.statusCode()), error.message().c_str());

        exit(1);

    }

private:

src/write_file_nonblocking.cc

+3 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ using kinetic::KineticConnectionFactory; 
using kinetic::Status;

using kinetic::KineticRecord;

using kinetic::PutCallbackInterface;

using kinetic::StatusCode;

using kinetic::KineticStatus;



using std::make_shared;

using std::unique_ptr;
@@ -27,8 +27,8 @@ public: 
        fflush(stdout);

        (*remaining_)--;

    }

    void Failure(StatusCode error) {

        printf("Error!\n");

    void Failure(KineticStatus error) {

        printf("Error: %d %s\n", static_cast<int>(error.statusCode()), error.message().c_str());

        exit(1);

    }

private:
@@ -88,7 +88,6 @@ int main(int argc, char* argv[]) { 
        remaining++;

        connection->nonblocking().Put(key, "", kinetic::IGNORE_VERSION, record, callback);

        connection->nonblocking().Run(&read_fds, &write_fds, &num_fds);



    }



    auto record = make_shared<KineticRecord>(std::to_string(inputfile_stat.st_size), "", "", Message_Algorithm_SHA1);