[cta-admin] Showqueues does not display disabled tapes, empty tapes and next mounts

- next mounts was introduced to anticipate the drive dedication
  implementation. As it is not implemented, it is removed from the cta-admin sq output

cmdline/CtaAdminTextFormatter.cpp

@@ -692,13 +692,10 @@ void TextFormatter::printShowQueuesHeader() {
     "cur. files",
     "cur. data",
     "MB/s",
-    "next mounts",
     "tapes capacity",
     "files on tapes",
     "data on tapes",
     "full tapes",
-    "empty tapes",
-    "disabled tapes",
     "writable tapes"
   );
 }
@@ -734,13 +731,10 @@ void TextFormatter::print(const ShowQueuesItem &sq_item) {
     sq_item.cur_files(),
     dataSizeToStr(sq_item.cur_bytes()),
     sq_item.bytes_per_second() / 1000000,
-    sq_item.next_mounts(),
     dataSizeToStr(sq_item.tapes_capacity()),
     sq_item.tapes_files(),
     dataSizeToStr(sq_item.tapes_bytes()),
     sq_item.full_tapes(),
-    sq_item.empty_tapes(),
-    sq_item.disabled_tapes(),
     sq_item.writable_tapes()
   );
 }

common/dataStructures/QueueAndMountSummary.hpp

@@ -46,13 +46,14 @@ struct QueueAndMountSummary {
   uint64_t currentFiles=0;
   uint64_t currentBytes=0;
   double latestBandwidth=0;
-  uint64_t nextMounts=0;
+  //Commenting this nextMounts value
+  //it is not useful for now. It was introduced in the past
+  //for the implementation of drive preemption.
+  //uint64_t nextMounts=0;
   uint64_t tapesCapacity=0;
   uint64_t filesOnTapes=0;
   uint64_t dataOnTapes=0;
   uint64_t fullTapes=0;
-  uint64_t emptyTapes=0;
-  uint64_t disabledTapes=0;
   uint64_t writableTapes=0;
   struct SleepForSpaceInfo {
     time_t startTime;

scheduler/Scheduler.cpp

@@ -1700,8 +1700,6 @@ std::list<common::dataStructures::QueueAndMountSummary> Scheduler::getQueuesAndM
     case common::dataStructures::MountType::Retrieve:
       if (em.currentMount) 
         summary.currentMounts++;
-      else
-        summary.nextMounts++;
       summary.currentBytes += em.bytesTransferred;
       summary.currentFiles += em.filesTransferred;
       summary.latestBandwidth += em.latestBandwidth;
@@ -1730,8 +1728,6 @@ std::list<common::dataStructures::QueueAndMountSummary> Scheduler::getQueuesAndM
         mountOrQueue.tapesCapacity = tapePool->capacityBytes;
         mountOrQueue.filesOnTapes = tapePool->nbPhysicalFiles;
         mountOrQueue.dataOnTapes = tapePool->dataBytes;
-        mountOrQueue.emptyTapes = tapePool->nbEmptyTapes;
-        mountOrQueue.disabledTapes = tapePool->nbDisabledTapes;
         mountOrQueue.fullTapes = tapePool->nbFullTapes;
         mountOrQueue.writableTapes = tapePool->nbWritableTapes;
       }
@@ -1755,9 +1751,6 @@ std::list<common::dataStructures::QueueAndMountSummary> Scheduler::getQueuesAndM
       mountOrQueue.tapesCapacity += t.capacityInBytes;
       mountOrQueue.filesOnTapes += t.lastFSeq;
       mountOrQueue.dataOnTapes += t.dataOnTapeInBytes;
-      if (!t.dataOnTapeInBytes)
-        mountOrQueue.emptyTapes++;
-      if (t.isDisabled()) mountOrQueue.disabledTapes++;
       if (t.full) mountOrQueue.fullTapes++;
       if (!t.full && !t.isDisabled()) mountOrQueue.writableTapes++;
       mountOrQueue.tapePool = t.tapePoolName;

xroot_plugins/XrdCtaShowQueues.hpp

@@ -105,13 +105,10 @@ int ShowQueuesStream::fillBuffer(XrdSsiPb::OStreamBuffer<Data> *streambuf) {
     sq_item->set_cur_files(sq.currentFiles);
     sq_item->set_cur_bytes(sq.currentBytes);
     sq_item->set_bytes_per_second(sq.latestBandwidth);
-    sq_item->set_next_mounts(sq.nextMounts);
     sq_item->set_tapes_capacity(sq.tapesCapacity);
     sq_item->set_tapes_files(sq.filesOnTapes);
     sq_item->set_tapes_bytes(sq.dataOnTapes);
     sq_item->set_full_tapes(sq.fullTapes);
-    sq_item->set_empty_tapes(sq.emptyTapes);
-    sq_item->set_disabled_tapes(sq.disabledTapes);
     sq_item->set_writable_tapes(sq.writableTapes);
     sq_item->set_vo(sq.vo);
     sq_item->set_read_max_drives(sq.readMaxDrives);