Fault tolerance

.github/workflows/cmake-multi-platform.yml

@@ -0,0 +1,32 @@
+name: CMake Build (Ubuntu + macOS)
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    name: Build on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Configure CMake
+      run: cmake -B build
+
+    - name: Build
+      run: cmake --build build
+
+    - name: Upload artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: my-app-${{ matrix.os }}
+        path: |
+          build/my-executable  # <-- cambia questo con il tuo eseguibile

.gitignore

@@ -7,5 +7,5 @@ CMakeFiles/*
 !build/build.sh
 !build/buildGnome.sh
 !build/buildTestMultiClient.sh
-!build/buildTestMultiDataNodes.sh
+!build/buildTestMultiDataNode.sh
 !build/buildTestMultiple.sh

.vscode/c_cpp_properties.json

@@ -6,7 +6,8 @@
                 "${workspaceFolder}/**",
                 "/usr/local/Cellar/sdl2/2.32.2/include/SDL2",
                 "${workspaceFolder}/common/src/filesystem",
-                "${workspaceFolder}/common/src/squidprotocol"
+                "${workspaceFolder}/common/src/squidprotocol",
+                "/usr/include/SDL2"
             ],
             "defines": [],
             "compilerPath": "/usr/bin/clang",

build/build.sh

@@ -4,9 +4,9 @@ cmake ..
 make -j 8
 
 # Move executables to their respective directories
-mv ./SquidStorage ../test_txt/test_client/SquidStorage
-mv ./SquidStorageServer ../test_txt/test_server/SquidStorageServer
-mv ./DataNode ../test_txt/test_datanode/DataNode
+cp ./SquidStorage ../test_txt/test_client/SquidStorage
+cp ./SquidStorageServer ../test_txt/test_server/SquidStorageServer
+cp ./DataNode ../test_txt/test_datanode/DataNode
 
 # Start a new tmux session
 SESSION_NAME="SquidStorage"

build/buildTestMultiDataNode.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+# Build the project
+cmake ..
+make -j 8
+
+# Move executables to their respective directories
+cp ./SquidStorage ../test_txt/test_client1/SquidStorage
+cp ./SquidStorageServer ../test_txt/test_server/SquidStorageServer
+cp ./DataNode ../test_txt/test_datanode1/DataNode
+cp ./DataNode ../test_txt/test_datanode2/DataNode
+cp ./DataNode ../test_txt/test_datanode3/DataNode
+
+# Start a new tmux session
+SESSION_NAME="SquidStorage"
+tmux new-session -d -s $SESSION_NAME
+tmux set -g mouse on
+
+# Run SquidStorageServer in the first pane
+tmux rename-window -t $SESSION_NAME "Server"
+tmux send-keys -t $SESSION_NAME "cd ../test_txt/test_server && ./SquidStorageServer" C-m
+sleep 2
+# Split the window and run DataNode in the second pane
+tmux split-window -h
+tmux send-keys "cd ../test_txt/test_datanode1 && ./DataNode" C-m
+
+tmux split-window -h
+tmux send-keys "cd ../test_txt/test_datanode2 && ./DataNode" C-m
+
+tmux split-window -h
+tmux send-keys "cd ../test_txt/test_datanode3 && ./DataNode" C-m
+
+# Split the window vertically and run SquidStorage in the third pane
+tmux split-window -v
+tmux send-keys "cd ../test_txt/test_client1 && ./SquidStorage" C-m
+
+# Attach to the tmux session
+tmux select-pane -t 0
+tmux attach-session -t $SESSION_NAME
+
+# Clean up executables after execution
+rm -f ../test_txt/test_client1/SquidStorage
+rm -f ../test_txt/test_server/SquidStorageServer
+rm -f ../test_txt/test_datanode1/DataNode
+rm -f ../test_txt/test_datanode2/DataNode
+rm -f ../test_txt/test_datanode3/DataNode
+# make clean

client/src/client.cpp

@@ -37,10 +37,10 @@ void Client::run()
 
 void Client::checkSecondarySocket()
 {
-    while (!secondarySquidProtocol.isAlive())
+    if (!secondarySquidProtocol.isAlive())
     {
         cout << "[CLIENT]: Lost connection, reconnecting..." << endl;
-        this_thread::sleep_for(chrono::seconds(5));
+        return;
         // this->initiateConnection();
         // if(secondarySquidProtocol.isAlive()) this->syncStatus();
     }
@@ -62,15 +62,23 @@ void Client::checkSecondarySocket()
         return;
     }
 
-    // Se ci sono dati sulla socket secondaria
+    // if data on second socket
     if (FD_ISSET(secondarySquidProtocol.getSocket(), &readfds))
     {
         try
         {
-            // Ricevi e gestisci il messaggio
             Message mex = secondarySquidProtocol.receiveAndParseMessage();
             cout << "[CLIENT]: Received message on secondary socket: " + mex.keyword << endl;
-            secondarySquidProtocol.requestDispatcher(mex);
+            if (mex.keyword == RELEASE_LOCK)
+            {
+                cout << "[CLIENT]: Received request for FileLock release" << endl;
+                FileManager::getInstance().getFileLock().setIsLocked(true);
+            }
+            else 
+            {
+                secondarySquidProtocol.requestDispatcher(mex);
+            }
+
         }
         catch (exception &e)
         {
@@ -79,10 +87,11 @@ void Client::checkSecondarySocket()
     }
     else
     {
-        // Nessun messaggio disponibile
-        cout << "[CLIENT]: No messages on secondary socket" << endl;
+        return;
+        // cout << "[CLIENT]: No message available on secondary socket" << endl;
     }
 }
+
 void Client::initiateConnection()
 {
     this->connectToServer();
@@ -147,6 +156,10 @@ void Client::createFile(string filePath)
 {
     handleRequest(squidProtocol.createFile(filePath));
 }
+void Client::createFile(string filePath, int version)
+{
+    handleRequest(squidProtocol.createFile(filePath, version));
+}
 
 void Client::deleteFile(string filePath)
 {
@@ -158,6 +171,11 @@ void Client::updateFile(string filePath)
     handleRequest(squidProtocol.updateFile(filePath));
 }
 
+void Client::updateFile(std::string filePath, int version)
+{
+    handleRequest(squidProtocol.updateFile(filePath, version));
+}
+
 void Client::syncStatus()
 {
     handleRequest(squidProtocol.syncStatus());
@@ -173,6 +191,11 @@ void Client::releaseLock(string filePath)
     handleRequest(squidProtocol.releaseLock(filePath));
 }
 
+bool Client::isSecondarySocketAlive()
+{
+    return secondarySquidProtocol.isAlive();
+}
+
 void Client::testing()
 {
     this->initiateConnection();

client/src/client.hpp

@@ -11,7 +11,7 @@
 #include "squidprotocol.hpp"
 
 #define SERVER_IP "127.0.0.1"
-#define SERVER_PORT 8080
+#define SERVER_PORT 12345
 #define BUFFER_SIZE 1024
 
 class Client : public Peer
@@ -27,11 +27,14 @@ class Client : public Peer
     virtual void initiateConnection();
     virtual void checkSecondarySocket();
     virtual void createFile(std::string filePath);
+    virtual void createFile(std::string filePath, int version);
     virtual void deleteFile(std::string filePath);
     virtual void updateFile(std::string filePath);
+    virtual void updateFile(std::string filePath, int version);
     virtual void syncStatus();
     virtual bool acquireLock(std::string filePath);
     virtual void releaseLock(std::string filePath);
+    virtual bool isSecondarySocketAlive();
 
 private:
     SquidProtocol secondarySquidProtocol;