Changeset 1212 for XIOS

Timestamp:

07/12/17 12:27:06 (7 years ago)

Author:

oabramkina

Message:

File dibution among secondary servers done in a more flexible way. Tested.

Location:

XIOS/dev/XIOS_DEV_CMIP6/src/node

Files:

• context.cpp (modified) (3 diffs)
• context.hpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/node/context.cpp

@@ -825 +825 @@
      if (hasServer && hasClient)
      {
+       int nbPools = clientPrimServer.size();
+
        // (1) Find all enabled files in write mode
        for (int i = 0; i < this->enabledFiles.size(); ++i)
@@ -835 +837 @@
        int size = this->enabledWriteModeFiles.size();
        std::vector<std::pair<StdSize, CFile*> > dataSizeMap;
+       StdSize dataPerPool = 0;
        for (size_t i = 0; i < size; ++i)
        {
@@ -861 +864 @@
          dataSize /= outFreqSec;
          dataSizeMap.push_back(make_pair(dataSize,file));
-       }
-
-       // (3) Sort enabledWriteModeFiles
+         dataPerPool += dataSize;
+       }
+       dataPerPool /= nbPools;
        std::sort(dataSizeMap.begin(), dataSizeMap.end());
-       for (int i = 0; i < size; ++i)
-       {
-         enabledWriteModeFiles[i] = dataSizeMap[i].second;
-       }
-
-       // (4) Assign contextClient to each enabled file
-       int i,j;
-       for (i = 0, j=0; i < enabledFiles.size(); ++i)
-       {
-         if (enabledFiles[i]->mode.isEmpty() || (!enabledFiles[i]->mode.isEmpty() && enabledFiles[i]->mode.getValue() == CFile::mode_attr::write ))
+
+       // (3) Assign contextClient to each enabled file
+       std::vector<StdSize> poolData(nbPools);
+       int lazyPool = 0;
+       for (int i = dataSizeMap.size()-1; i >= 0; --i)
+       {
+         bool contextSet = false;
+         for (int j = 0; j < nbPools; ++j)
          {
-           int n = j / clientPrimServer.size();
-           int mod = j % clientPrimServer.size();
-           int poolId;
-           if (n % 2 == 0)
-             poolId =mod;
-           else
-             poolId = clientPrimServer.size()-1-mod;
-            enabledWriteModeFiles[j]->setContextClient(clientPrimServer[poolId]);
-           ++j;
+           if (!contextSet)
+           {
+             if (dataSizeMap[i].first + poolData[j] < dataPerPool)
+             {
+               dataSizeMap[i].second->setContextClient(clientPrimServer[j]);
+               poolData[j] += dataSizeMap[i].first;
+               contextSet = true;
+             }
+           }
+           if (poolData[j] < poolData[lazyPool])
+             lazyPool = j;
          }
-         else
+         if (!contextSet)
          {
-           enabledFiles[i]->setContextClient(client);
+           dataSizeMap[i].second->setContextClient(clientPrimServer[lazyPool]);
+           poolData[lazyPool] += dataSizeMap[i].first;
          }
        }
+
+       for (int i = 0; i < this->enabledReadModeFiles.size(); ++i)
+         enabledReadModeFiles[i]->setContextClient(client);
      }
      else

XIOS/dev/XIOS_DEV_CMIP6/src/node/context.hpp

@@ -136 +136 @@
          void setClientServerBuffer(CContextClient* contextClient);
 
-         // Estimate data size for each enabled file in write mode
+         // Distribute files (in write mode) among secondary-server pools according to the estimated data flux
          void distributeFiles(void);