Add billing this hour.
This commit is contained in:
zhuyj17
parent
ad2be9bad1
commit
f1db20c8ee
|
|
@ -115,7 +115,7 @@ class Container_Collector(threading.Thread):
|
|||
return ((days * 24 + hours) * 60 + minutes) * 60 + seconds
|
||||
|
||||
@classmethod
|
||||
def billing_increment(cls,vnode_name):
|
||||
def billing_increment(cls,vnode_name,isreal=True):
|
||||
global increment
|
||||
global workercinfo
|
||||
global G_masterip
|
||||
|
|
@ -124,7 +124,7 @@ class Container_Collector(threading.Thread):
|
|||
global c_disk
|
||||
cpu_val = '0'
|
||||
if vnode_name not in workercinfo.keys():
|
||||
return
|
||||
return 0
|
||||
if 'cpu_use' in workercinfo[vnode_name].keys():
|
||||
cpu_val = workercinfo[vnode_name]['cpu_use']['val']
|
||||
if vnode_name not in increment.keys():
|
||||
|
|
@ -137,20 +137,22 @@ class Container_Collector(threading.Thread):
|
|||
avemem = 0
|
||||
else:
|
||||
avemem = cpu_increment*float(increment[vnode_name]['memincrement'])/1800.0
|
||||
increment[vnode_name]['lastcputime'] = cpu_val
|
||||
increment[vnode_name]['memincrement'] = 0
|
||||
if 'disk_use' in workercinfo[vnode_name].keys():
|
||||
disk_quota = workercinfo[vnode_name]['disk_use']['total']
|
||||
else:
|
||||
disk_quota = 0
|
||||
#logger.info("cpu_increment:"+str(cpu_increment)+" avemem:"+str(avemem)+" disk:"+str(disk_quota)+"\n")
|
||||
billingval = cpu_increment/a_cpu + avemem/b_mem + float(disk_quota)/1024.0/1024.0/c_disk
|
||||
billingval = math.ceil(cpu_increment/a_cpu + avemem/b_mem + float(disk_quota)/1024.0/1024.0/c_disk)
|
||||
if not isreal:
|
||||
return math.ceil(billingval)
|
||||
increment[vnode_name]['lastcputime'] = cpu_val
|
||||
increment[vnode_name]['memincrement'] = 0
|
||||
if 'basic_info' not in workercinfo[vnode_name].keys():
|
||||
workercinfo[vnode_name]['basic_info'] = {}
|
||||
workercinfo[vnode_name]['basic_info']['billing'] = 0
|
||||
workercinfo[vnode_name]['basic_info']['RunningTime'] = 0
|
||||
nowbillingval = workercinfo[vnode_name]['basic_info']['billing']
|
||||
nowbillingval += math.ceil(billingval)
|
||||
nowbillingval += billingval
|
||||
try:
|
||||
vnode = VNode.query.get(vnode_name)
|
||||
vnode.billing = nowbillingval
|
||||
|
|
@ -174,7 +176,7 @@ class Container_Collector(threading.Thread):
|
|||
else:
|
||||
#logger.info("Billing User:"+str(owner))
|
||||
oldbeans = owner.beans
|
||||
owner.beans -= math.ceil(billingval)
|
||||
owner.beans -= billingval
|
||||
#logger.info(str(oldbeans) + " " + str(owner.beans))
|
||||
if oldbeans > 0 and owner.beans <= 0 or oldbeans >= 100 and owner.beans < 100 or oldbeans >= 500 and owner.beans < 500 or oldbeans >= 1000 and owner.beans < 1000:
|
||||
send_beans_email(owner.e_mail,owner.username,owner.beans)
|
||||
|
|
@ -193,6 +195,7 @@ class Container_Collector(threading.Thread):
|
|||
http = Http()
|
||||
[resp,content] = http.request("http://"+G_masterip+"/cluster/stopall/","POST",urlencode(form),headers = header)
|
||||
logger.info("response from master:"+content.decode('utf-8'))
|
||||
return billingval
|
||||
|
||||
def collect_containerinfo(self,container_name):
|
||||
global workerinfo
|
||||
|
|
@ -302,6 +305,7 @@ class Container_Collector(threading.Thread):
|
|||
mem_usedp = float(mem_val) / self.mem_quota[container_name]
|
||||
mem_use['usedp'] = mem_usedp
|
||||
workercinfo[container_name]['mem_use'] = mem_use
|
||||
workercinfo[container_name]['basic_info']['billing_this_hour'] = self.billing_increment(container_name,False)
|
||||
|
||||
if not container_name in lastbillingtime.keys():
|
||||
lastbillingtime[container_name] = int(running_time/self.billingtime)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
<tr>
|
||||
<th>NO</th>
|
||||
<th>VNode name</th>
|
||||
<th>Last billing</th>
|
||||
<th>Total billing</th>
|
||||
<th>History</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
|
|||
|
|
@ -86,7 +86,8 @@
|
|||
<th>Cpu Usage</th>
|
||||
<th>Mem Usage</th>
|
||||
<th>Disk Usage</th>
|
||||
<th>Billing</th>
|
||||
<th>Total Billing</th>
|
||||
<th>Billing This Hour</th>
|
||||
<th>Summary</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -107,6 +108,7 @@
|
|||
<td id='{{cluster}}_{{ loop.index }}_mem'>--</td>
|
||||
<td id='{{cluster}}_{{ loop.index }}_disk'>--</td>
|
||||
<td id='{{cluster}}_{{ loop.index }}_billing'>--</td>
|
||||
<td id='{{cluster}}_{{ loop.index }}_billingthishour'>--</td>
|
||||
<td><a class="btn btn-info btn-xs" href='/vclusters/{{ cluster }}/{{ container['containername'] }}/'>Realtime</a></td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
|
@ -142,6 +144,7 @@
|
|||
var secs = Math.floor(total % 3600 % 60);
|
||||
$("#"+index+"_time").html(hour+"h "+min+"m "+secs+"s")
|
||||
$("#"+index+"_billing").html(data.monitor.basic_info.billing+" <img src='/static/img/bean.png' />")
|
||||
$("#"+index+"_billingthishour").html(data.monitor.basic_info.billing_this_hour+" <img src='/static/img/bean.png' />")
|
||||
|
||||
var state = data.monitor.basic_info.State;
|
||||
if(state == 'RUNNING')
|
||||
|
|
|
|||
|
|
@ -45,7 +45,8 @@
|
|||
<th>CPU Usage</th>
|
||||
<th>Mem Usage</th>
|
||||
<th>Disk Usage</th>
|
||||
<th>Billing</th>
|
||||
<th>Total Billing</th>
|
||||
<th>Billing This Hour</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -61,7 +62,8 @@
|
|||
<td id='con_cpu'>--</td>
|
||||
<td id='con_mem'>--</td>
|
||||
<td id='con_disk'>--</td>
|
||||
<td id='con_billing'>{{ container['billing'] }} beans</td>
|
||||
<td id='con_billing'>{{ container['billing'] }} <img src='/static/img/bean.png' /></td>
|
||||
<td id='con_billingthishour'>{{ container['billing_this_hour'] }} <img src='/static/img/bean.png' /></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
|
|||
Loading…
Reference in New Issue