Revision 621a1869 src/scheduler/src/sched/Scheduler.cc

View differences:

src/scheduler/src/sched/Scheduler.cc
546 546
        PoolObjectAuth hperms;
547 547

  
548 548
        hperms.oid      = host->get_hid();
549
        hperms.cid      = host->get_cid();
549
        hperms.cids     = host->get_cids();
550 550
        hperms.obj_type = PoolObjectSQL::HOST;
551 551

  
552 552
        UserXML * user = upool->get(vm->get_uid());
......
1050 1050
    long long dsk;
1051 1051
    vector<VectorAttribute *> pci;
1052 1052

  
1053
    int hid, dsid, cid;
1053
    int hid, dsid;
1054
    set<int> cids;
1054 1055
    bool test_cap_result;
1055 1056

  
1056 1057
    unsigned int dispatched_vms = 0;
......
1113 1114
                continue;
1114 1115
            }
1115 1116

  
1116
            cid = host->get_cid();
1117
            cids = host->get_cids();
1117 1118

  
1118 1119
            //------------------------------------------------------------------
1119 1120
            // Test host capacity
......
1170 1171
                //--------------------------------------------------------------
1171 1172
                // Test cluster membership for datastore and selected host
1172 1173
                //--------------------------------------------------------------
1173
                if (ds->get_cid() != cid)
1174
                if (!ds->is_in_cluster(cids))
1174 1175
                {
1175 1176
                    continue;
1176 1177
                }

Also available in: Unified diff