SSDM-5975 : Updating DSS workspace and queues defaults

SVN: 38995

datastore_server/dist/etc/service.properties

@@ -4,8 +4,11 @@ data-store-server-code = DSS1
 # The root directory of the data store
 storeroot-dir = data/store
 
-# The directory where the command queue file is located; defaults to storeroot-dir 
-commandqueue-dir =
+# The session workspace is stored in the storage root by default to have the same amount of space available that the final storage and allow atomic moves
+session-workspace-root-dir = ${storeroot-dir}/sessionWorkspace
+
+# The directory where the command queue file is located; defaults to storeroot-dir but ideally should be on the same computer as the server on a directory that survives upgrades
+commandqueue-dir = ../../datastore_commandqueue
 
 # Port
 port = 8444

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/CommandQueueLister.java

@@ -31,6 +31,10 @@ public final class CommandQueueLister
     public static void listQueuedCommand()
     {
         final ConfigParameters configParams = DataStoreServer.getConfigParameters();
+        if (!configParams.getCommandQueueDir().exists())
+        {
+            configParams.getCommandQueueDir().mkdirs();
+        }
         DataSetCommandExecutor.listQueuedCommands(configParams.getCommandQueueDir());
     }
 }