trafodion-codereview mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prashanth-vasudev <...@git.apache.org>
Subject [GitHub] incubator-trafodion pull request #647: [TRAFODION-2146] Use of CQD to set sc...
Date Tue, 09 Aug 2016 14:52:39 GMT
Github user prashanth-vasudev commented on a diff in the pull request:

    https://github.com/apache/incubator-trafodion/pull/647#discussion_r74074060
  
    --- Diff: core/sqf/src/stfs/stfs_stub.cpp ---
    @@ -328,63 +332,69 @@ copySTFSLocation(int pv_instnum)
     {
     
       //Directory locations not specified 
    -  if ((STFS_stub::stfsDirsHDD_.numLocations <= 0) && (STFS_stub::overflowType_
== STFS_HDD)) {
    +  if ((STFS_stub::stfsDirsHDD_.numLocations <= 0) && (STFS_stub::overflowType_
== STFS_HDD)) 
         return;
    -  }
    -  if ((STFS_stub::stfsDirsSSD_.numLocations <= 0) && (STFS_stub::overflowType_
== STFS_SSD)) {
    +  
    +  if ((STFS_stub::stfsDirsSSD_.numLocations <= 0) && (STFS_stub::overflowType_
== STFS_SSD)) 
         return;
    -  }
    +  
     
     
    -  if(STFS_stub::overflowType_ == STFS_HDD) {
    -    copyLocationHelper(STFS_stub::stfsDirsHDD_, pv_instnum);
    -  }
    -  else if(STFS_stub::overflowType_ == STFS_SSD) {
    +  if(STFS_stub::overflowType_ == STFS_HDD) 
    +    copyLocationHelper(STFS_stub::stfsDirsHDD_, pv_instnum);  
    +  else if(STFS_stub::overflowType_ == STFS_SSD) 
         copyLocationHelper(STFS_stub::stfsDirsSSD_, pv_instnum);
    -  }
    +  
     
    -  if (STFS_stub::stfsLocation_[strlen(STFS_stub::stfsLocation_) - 1] != '/') {
    +  if (STFS_stub::stfsLocation_[strlen(STFS_stub::stfsLocation_) - 1] != '/') 
         strcat(STFS_stub::stfsLocation_, "/");
    -  }
    -
    +  
     }
     
    +/// \brief Sets the scratchdisks as specified in the CQD SCRATCH_DISKS 
    +///        and avoids looking at envvar
    +void STFS_set_scratch_dirs(char *pv_scratchloc) 
    +{
    +   memset(STFS_stub::scratchCQDLocationString_, 0, sizeof(STFS_stub::scratchCQDLocationString_));
    +  strcpy((char *)STFS_stub::scratchCQDLocationString_,pv_scratchloc);
    +}
     /// \brief Checks for the Location Env Variable 
     ///        and processes it
     void STFS_checkLocation(int pv_instnum) 
     {
    +  char *lp_HDDEnvLocation = getenv("STFS_HDD_LOCATION");
    +  char *lp_SSDEnvLocation = getenv("STFS_SSD_LOCATION");
       if (STFS_stub::locationEnvChecked_) {
         copySTFSLocation(pv_instnum);
         return;
       }
    -
    -  char *lp_HDDEnvLocation = getenv("STFS_HDD_LOCATION");
    -  char *lp_SSDEnvLocation = getenv("STFS_SSD_LOCATION");
    -  char *lp_EnvLocation    = getenv("STFS_LOCATION");
    -
    +  if ((strlen(STFS_stub::scratchCQDLocationString_)>0) && (STFS_stub::overflowType_
== STFS_HDD)) 
    --- End diff --
    
    In general, in this stfs layer, since we are in linux environment, HDD or SSD need not
be distinguished. Both will be specified by simple directory path. STFS layer need not do
separate handling for each.  Code can be simplified.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message