- for m in self.config_var_re.finditer(data):
- (key, val) = m.groups()
- newval = todo.pop(key, None)
- if newval != None:
- data = data[:m.start(2)] + str(newval) + data[m.end(2):]
- changed = True
- for (newkey, newval) in todo.items():
- data += "%s=%s\n" % (newkey, newval)
- changed = True
-
- if not changed:
- return
+ try:
+ old_hard, old_soft, old_minimum = self.get_rlimit_limit(type)
+ if old_hard != VC_LIM_KEEP and old_hard <> hard: changed = True
+ if old_soft != VC_LIM_KEEP and old_soft <> soft: changed = True
+ if old_minimum != VC_LIM_KEEP and old_minimum <> minimum: changed = True
+ self.rlimits_changed = self.rlimits_changed or changed
+ except OSError, e:
+ if self.is_running(): print "Unexpected error with getrlimit for running context %d" % self.ctx
+
+ resource_type = RLIMITS[type]
+ try:
+ ret = vserverimpl.setrlimit(self.ctx,resource_type,hard,soft,minimum)
+ except OSError, e:
+ if self.is_running(): print "Unexpected error with setrlimit for running context %d" % self.ctx
+
+ def set_rlimit_config(self,type,hard,soft,minimum):
+ """Generic set resource limit function for vserver"""
+ if hard <> VC_LIM_KEEP:
+ self.config.update('rlimits/%s.hard' % type.lower(), hard)
+ if soft <> VC_LIM_KEEP:
+ self.config.update('rlimits/%s.soft' % type.lower(), soft)
+ if minimum <> VC_LIM_KEEP:
+ self.config.update('rlimits/%s.min' % type.lower(), minimum)
+ self.set_rlimit_limit(type,hard,soft,minimum)
+
+ def get_rlimit_limit(self,type):
+ """Generic get resource configuration function for vserver"""
+ global RLIMITS
+ resource_type = RLIMITS[type]
+ try:
+ ret = vserverimpl.getrlimit(self.ctx,resource_type)
+ except OSError, e:
+ print "Unexpected error with getrlimit for context %d" % self.ctx
+ ret = self.get_rlimit_config(type)
+ return ret